修改生成审批流接口

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditItemsServiceImpl.java

@@ -115,7 +115,12 @@ public class AuditItemsServiceImpl implements IAuditItemsService {
                         reviewer = true;
                         for (SysUser use : userList) {
                             if (Objects.equals(num, 1)) {
-                                userId = use.getUserId();
+                                auditItem.setAuditUserId(use.getUserId());
+                                int addAuditItem = auditItemsMapper.insertAuditItems(auditItem);
+                                if (addAuditItem <= 0) {
+                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                                    return AjaxResult.error("生成审批流明细失败，请联系管理员");
+                                }
                             }
                             AuditItemsUsers auditItemsUsers = createAuditItemsUsers(num, use.getUserId(), auditItem);
                             int addAuditUser = auditItemsUsersMapper.insertAuditItemsUsers(auditItemsUsers);
@@ -130,9 +135,14 @@ public class AuditItemsServiceImpl implements IAuditItemsService {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("审批流第" + num + "级所选角色中没有用户");
                 }
-                auditItem.setAuditUserId(userId);
+
             } else {
                 auditItem.setAuditUserId(userIdList.get(0));
+                int addAuditItem = auditItemsMapper.insertAuditItems(auditItem);
+                if (addAuditItem <= 0) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("生成审批流明细失败，请联系管理员");
+                }
                 for (Long usId : userIdList) {
                     AuditItemsUsers auditItemsUsers = createAuditItemsUsers(num, usId, auditItem);
                     int addAuditUser = auditItemsUsersMapper.insertAuditItemsUsers(auditItemsUsers);
@@ -142,11 +152,6 @@ public class AuditItemsServiceImpl implements IAuditItemsService {
                     }
                 }
             }
-            int addAuditItem = auditItemsMapper.insertAuditItems(auditItem);
-            if (addAuditItem <= 0) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return AjaxResult.error("生成审批流明细失败，请联系管理员");
-            }
         }
         return AjaxResult.success();
     }