Merge remote-tracking branch 'origin/master'

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

@@ -361,12 +361,6 @@ public class NegativeService extends ServiceImpl<NegativeMapper, Negative> {
                     negative.setThreeInvolveDepartId(dept.getId());
                     negative.setSecondInvolveDepartId(dept.getPid());
                 }
-            } 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())
@@ -378,7 +372,12 @@ public class NegativeService extends ServiceImpl<NegativeMapper, Negative> {
                         .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 work = new NegativeWork()
                     .setNegativeId(negative.getId())
                     .setDepartId(departId)