feature 代码提交

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/impl/BillGenerationServiceImpl.java

@@ -57,7 +57,7 @@ public class BillGenerationServiceImpl {
     public void generateBill(List<SwWaterUsageEntryDo> swWaterUsageEntryDoList,ServletRequestAttributes attributes) {
         RequestContextHolder.setRequestAttributes(attributes);
         SysUserVo currentUser = ZHSWCommonUtils.getCurrentUser();
-        ;
+
         log.info("当前生成账单的用户：{},所属的租户库为:{}",currentUser.getAccount(),currentUser.getTenantDo().getDskey());
         if (swWaterUsageEntryDoList == null || swWaterUsageEntryDoList.isEmpty()) {
             log.error("暂无需要生成账单的信息");

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/impl/MeterReadingServiceImpl.java

@@ -45,7 +45,9 @@ public class MeterReadingServiceImpl implements MeterReadingService {
         // 获取抄表记录
         SwWaterUsageEntryDo swWaterUsageEntryDo = swWaterUsageEntryService.getById(id);
         // 本次记录由换表生成无法删除
-        UtilsChecks.parameterCheck(()->"9".equals(swWaterUsageEntryDo.getReadingsource()),"本次抄表记录由换表生成无法删除","本次抄表记录由换表生成无法删除");
+        if("9".equals(swWaterUsageEntryDo.getReadingsource())){
+            throw new CustomException("本次抄表记录由换表生成无法删除");
+        }
         // 户号信息
         String userNumber = swWaterUsageEntryDo.getUsernumber();
         // 判断改抄表记录是否是最新的抄表