Merge remote-tracking branch 'origin/master'

src/main/java/com/biutag/supervision/service/NegativeService.java

@@ -361,24 +361,23 @@ public class NegativeService extends ServiceImpl<NegativeMapper, Negative> {
                     negative.setThreeInvolveDepartId(dept.getId());
                     negative.setSecondInvolveDepartId(dept.getPid());
                 }
+                // 创建待办
+                NegativeWork firstWork = new NegativeWork()
+                        .setNegativeId(negative.getId())
+                        .setStatus(WorkStatusEnum.done.name())
+                        .setDepartId(AppConstants.ROOT_DEPART_ID)
+                        .setDepartName(AppConstants.ROOT_DEPART_NAME)
+                        .setRoleCode(RoleCodeEnum.FIRST_ADMIN.getCode())
+                        .setProblemSourcesCode(negative.getProblemSourcesCode())
+                        .setUpdateTime(now)
+                        .setCreateTime(now);
+                workService.save(firstWork);
             } else {
                 log.error("未匹配上单位：{}， code: {}", item.getDepartName(), item.getDepartCode());
                 departId = AppConstants.ROOT_DEPART_ID;
                 departName = AppConstants.ROOT_DEPART_NAME;
                 roleCode = RoleCodeEnum.FIRST_ADMIN.getCode();
             }
-            // 创建待办
-            NegativeWork firstWork = new NegativeWork()
-                    .setNegativeId(negative.getId())
-                    .setStatus(WorkStatusEnum.done.name())
-                    .setDepartId(AppConstants.ROOT_DEPART_ID)
-                    .setDepartName(AppConstants.ROOT_DEPART_NAME)
-                    .setRoleCode(RoleCodeEnum.FIRST_ADMIN.getCode())
-                    .setProblemSourcesCode(negative.getProblemSourcesCode())
-                    .setUpdateTime(now)
-                    .setCreateTime(now);
-            workService.save(firstWork);
-
             NegativeWork work = new NegativeWork()
                     .setNegativeId(negative.getId())
                     .setDepartId(departId)