1

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/PayChargeSurveyServiceImpl.java

@@ -77,10 +77,10 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
     public PayChargeSurveyDto accountSurvey(){
         PayChargeSurveyDto payChargeSurveyDto = new PayChargeSurveyDto();
         LoginUser loginUser = UserUtil.getCurrentUser();
-        if(loginUser == null && loginUser.getCustomerId() == null){
+        if(loginUser == null || loginUser.getCustomerId() == null){
             return payChargeSurveyDto;
         }
-        if(loginUser == null && loginUser.getSiteId() != null){
+        if(loginUser == null || loginUser.getSiteId() != null){
             return payChargeSurveyDto;
         }
         DecimalFormat df = new DecimalFormat("0.0");
@@ -277,10 +277,10 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
     public PayTransactionSurveyDto tranSurvey(String periodDate){
         PayTransactionSurveyDto payTransactionSurveyDto = new PayTransactionSurveyDto();
         LoginUser loginUser = UserUtil.getCurrentUser();
-        if(loginUser == null && loginUser.getCustomerId() == null){
+        if(loginUser == null || loginUser.getCustomerId() == null){
             return payTransactionSurveyDto;
         }
-        if(loginUser == null && loginUser.getSiteId() != null){
+        if(loginUser == null || loginUser.getSiteId() != null){
             return payTransactionSurveyDto;
         }
         BigInteger siteId = BigInteger.valueOf(loginUser.getSiteId());
@@ -536,10 +536,10 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
     public PayFeeSueveyDto feeSurvey(){
         PayFeeSueveyDto payFeeSveveyDto = new PayFeeSueveyDto();
         LoginUser loginUser = UserUtil.getCurrentUser();
-        if(loginUser == null && loginUser.getCustomerId() == null){
+        if(loginUser == null || loginUser.getCustomerId() == null){
             return payFeeSveveyDto;
         }
-        if(loginUser == null && loginUser.getSiteId() != null){
+        if(loginUser == null || loginUser.getSiteId() != null){
             return payFeeSveveyDto;
         }
         BigInteger siteId = BigInteger.valueOf(loginUser.getSiteId());
@@ -626,10 +626,10 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
     public PayAmountSurveyDto amountSurver(){
         PayAmountSurveyDto payAmountSurveyDto = new PayAmountSurveyDto();
         LoginUser loginUser = UserUtil.getCurrentUser();
-        if(loginUser == null && loginUser.getCustomerId() == null){
+        if(loginUser == null || loginUser.getCustomerId() == null){
             return payAmountSurveyDto;
         }
-        if(loginUser == null && loginUser.getSiteId() != null){
+        if(loginUser == null || loginUser.getSiteId() != null){
             return payAmountSurveyDto;
         }