修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ExpenseSheetServiceImpl.java

@@ -118,6 +118,10 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
         boolean isAuditor = functionDeptList.size() > 0;
         boolean isNew = false;
         if (sheet.getId() == null) {
+            if (((sheet.getTotalAmount()==null||sheet.getTotalAmount()==0)) &&expenseMainType!=null&&!sheet.getType().equals(expenseMainType.getId())){
+                msg.setError("费用金额不能为空或等于0");
+                return msg;
+            }
             //柘中公司
             if (user.getCompanyId()==Constant.ZHE_ZHONG_COMPANY_ID&&expenseMainType!=null&&sheet.getType().equals(expenseMainType.getId())){
                 if (sheet.getOwnerId().equals(userId)){
@@ -164,11 +168,11 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                     return msg;
                 }
                 //柘中公司
-                if (sheet.getTotalAmount()==null){
-                    msg.setError("费用金额不能为空");
+                if (sheet.getTotalAmount()==null||sheet.getTotalAmount()==0){
+                    msg.setError("费用金额不能为空或等于0");
                     return msg;
                 }
-                if (sheet.getTotalAmount() > 0) {
+                if (sheet.getTotalAmount() >0) {
                     sheet.setStatus(1);//待审核
                     sheet.setReviewProcess(0);//待第一审核人审核
                 }
@@ -348,7 +352,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
             expenseItemService.saveBatch(itemList);
         }
 
-        if (isNew && auditSetting != null && auditSetting.getAuditType() == 1&&sheet.getFirstCheckerId()!=null) {
+        if (isNew && auditSetting != null && auditSetting.getAuditType() == 1&& org.apache.commons.lang3.StringUtils.isNotEmpty(sheet.getFirstCheckerId())) {
             //发送给项目经理审核
             List<Integer> collect = itemList.stream().map(ExpenseItem::getProjectId).collect(Collectors.toList());
             if (collect.size() > 0) {
@@ -404,7 +408,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                 }
             }
         }
-        else if (isNew && auditSetting != null && auditSetting.getAuditType() == 2&&sheet.getFirstCheckerId()!=null) {
+        else if (isNew && auditSetting != null && auditSetting.getAuditType() == 2&&org.apache.commons.lang3.StringUtils.isNotEmpty(sheet.getFirstCheckerId())) {
             //发送给第一审核人审核
             List<User> targetUserList = new ArrayList<>();
             User firstChecker = userMapper.selectById(sheet.getFirstCheckerId());