1判断customerId为空

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

@@ -27,6 +27,7 @@ import java.math.BigInteger;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -546,8 +547,11 @@ public class BaseClosingAccountInfoServiceImpl implements BaseClosingAccountInfo
     @Override
     public List<BaseClosingAccountInfoDto> getAll() {
         LoginUser loginUser = UserUtil.getCurrentUser();
-        List<BaseClosingAccountInfoDto> list = baseClosingAccountInfoMapper.getList(null,null, BigInteger.valueOf(loginUser.getCurrentSiteId()),
-                BigInteger.valueOf(loginUser.getCustomerId()),null);
+        List<BaseClosingAccountInfoDto> list = new ArrayList<BaseClosingAccountInfoDto>();
+        if((loginUser != null && loginUser.getSiteId() != null ) && (loginUser != null && loginUser.getCustomerId() != null )){
+            list = baseClosingAccountInfoMapper.getList(null,null, BigInteger.valueOf(loginUser.getCurrentSiteId()),
+                    BigInteger.valueOf(loginUser.getCustomerId()),null);
+        }
         return list;
     }
 

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

@@ -77,6 +77,12 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
     public PayChargeSurveyDto accountSurvey(){
         PayChargeSurveyDto payChargeSurveyDto = new PayChargeSurveyDto();
         LoginUser loginUser = UserUtil.getCurrentUser();
+        if(loginUser == null && loginUser.getCustomerId() == null){
+            return payChargeSurveyDto;
+        }
+        if(loginUser == null && loginUser.getSiteId() != null){
+            return payChargeSurveyDto;
+        }
         DecimalFormat df = new DecimalFormat("0.0");
         BigDecimal defc = new BigDecimal("0.0");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");//格式化为年月日
@@ -271,6 +277,12 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
     public PayTransactionSurveyDto tranSurvey(String periodDate){
         PayTransactionSurveyDto payTransactionSurveyDto = new PayTransactionSurveyDto();
         LoginUser loginUser = UserUtil.getCurrentUser();
+        if(loginUser == null && loginUser.getCustomerId() == null){
+            return payTransactionSurveyDto;
+        }
+        if(loginUser == null && loginUser.getSiteId() != null){
+            return payTransactionSurveyDto;
+        }
         BigInteger siteId = BigInteger.valueOf(loginUser.getSiteId());
         BigInteger customerId = null;
         Integer cus = loginUser.getCustomerId() != null ? loginUser.getCustomerId() : null;
@@ -524,6 +536,12 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
     public PayFeeSueveyDto feeSurvey(){
         PayFeeSueveyDto payFeeSveveyDto = new PayFeeSueveyDto();
         LoginUser loginUser = UserUtil.getCurrentUser();
+        if(loginUser == null && loginUser.getCustomerId() == null){
+            return payFeeSveveyDto;
+        }
+        if(loginUser == null && loginUser.getSiteId() != null){
+            return payFeeSveveyDto;
+        }
         BigInteger siteId = BigInteger.valueOf(loginUser.getSiteId());
         BigInteger customerId = BigInteger.valueOf(loginUser.getCustomerId());
         BigDecimal defc = new BigDecimal("0.0");
@@ -608,6 +626,13 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
     public PayAmountSurveyDto amountSurver(){
         PayAmountSurveyDto payAmountSurveyDto = new PayAmountSurveyDto();
         LoginUser loginUser = UserUtil.getCurrentUser();
+        if(loginUser == null && loginUser.getCustomerId() == null){
+            return payAmountSurveyDto;
+        }
+        if(loginUser == null && loginUser.getSiteId() != null){
+            return payAmountSurveyDto;
+        }
+
         BigInteger siteId = BigInteger.valueOf(loginUser.getSiteId());
         BigInteger customerId = BigInteger.valueOf(loginUser.getCustomerId());
         BigDecimal defb = new BigDecimal("1.0");