update

bailuntec-cost-core/src/main/java/com/blt/other/module/sys/service/impl/DepartmentReviewerServiceImpl.java

@@ -56,6 +56,7 @@ public class DepartmentReviewerServiceImpl extends ServiceImpl<DepartmentReviewe
 
         if (ListUtil.isNotEmpty(page.getRecords())) {
             Map<Integer, List<CostReviewer>> cMap = costReviewerMapper.selectList(new LambdaQueryWrapper<CostReviewer>()
+                    .eq(CostReviewer::getType, CostReviewer.departmentReviewer)
                     .in(CostReviewer::getReferId, page.getRecords().stream().map(DepartmentReviewerListItem::getId).collect(Collectors.toList())))
                     .stream()
                     .collect(Collectors.groupingBy(CostReviewer::getReferId));
@@ -84,6 +85,7 @@ public class DepartmentReviewerServiceImpl extends ServiceImpl<DepartmentReviewe
 
         if (ListUtil.isNotEmpty(req.getDepartmentReviewerUserIdList())) {
             costReviewerMapper.delete(new LambdaQueryWrapper<CostReviewer>()
+                    .eq(CostReviewer::getType, CostReviewer.departmentReviewer)
                     .eq(CostReviewer::getReferId, req.getId()));
 
             this.saveDepartmentCostReviewer(req.getDepartmentReviewerUserIdList(), req.getId());

bailuntec-cost-core/src/test/java/com/blt/other/OtherApplicationTests.java

@@ -28,6 +28,7 @@ import com.blt.other.module.sys.dao.CostReviewerMapper;
 import com.blt.other.module.sys.dao.DepartmentReviewerMapper;
 import com.blt.other.module.sys.model.CostReviewer;
 import com.blt.other.module.sys.model.DepartmentReviewer;
+import com.blt.other.module.sys.service.IDepartmentReviewerService;
 import lombok.Data;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -376,5 +377,36 @@ public class OtherApplicationTests {
                 });
     }
 
+    @Resource
+    IDepartmentReviewerService departmentReviewerService;
+
+
+    @Test
+    @Rollback(value = false)
+    public void testOaDepartment() {
+        departmentReviewerMapper.delete(new LambdaQueryWrapper<>());
+        costReviewerMapper.delete(new LambdaQueryWrapper<CostReviewer>().eq(CostReviewer::getType, CostReviewer.departmentReviewer));
+        List<OaDepartment> oaDepartmentList = oaDepartmentService.list(new LambdaQueryWrapper<OaDepartment>()
+                .eq(OaDepartment::getParentId, 0));
+
+        oaDepartmentList.forEach(oaDepartment -> {
+            DepartmentReviewer departmentReviewer = new DepartmentReviewer();
+            departmentReviewer.setPrimaryDepartmentId(oaDepartment.getDepartmentId());
+            departmentReviewer.setPrimaryDepartmentName(oaDepartment.getName());
+            departmentReviewer.setSecondDepartmentName("全部");
+            departmentReviewer.setSecondDepartmentId(0);
+            departmentReviewerService.save(departmentReviewer);
+
+            OaUser oaUser = oaUserMapper.selectByUserName(oaDepartment.getManageUser1());
+            CostReviewer costReviewer = new CostReviewer();
+            costReviewer.setType(CostReviewer.departmentReviewer);
+            costReviewer.setReferId(departmentReviewer.getId());
+            costReviewer.setReviewerUserId(oaUser.getOaUserId());
+            costReviewer.setReviewerUserName(oaUser.getUserName());
+            costReviewerMapper.insert(costReviewer);
+        });
+
+    }
+
 }