Explorar el Código

案例,模型列表子部門數據

lyhzzz hace 1 año
padre
commit
be1bb219fb

+ 2 - 4
src/main/java/com/fdkankan/fusion/service/impl/CaseServiceImpl.java

@@ -63,10 +63,8 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
         if(deptIds.size() <=0){
             return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
         }
-        if(StringUtils.isNotBlank(param.getDeptId())){
-            wrapper.eq(CaseEntity::getDeptId,param.getDeptId());
-        }
-        wrapper.in(CaseEntity::getDeptId,deptIds);
+        List<String> deptIds2 = tmDepartmentService.getSonByDeptIdAndDeptIds(deptIds, param.getDeptId());
+        wrapper.in(CaseEntity::getDeptId,deptIds2);
         //wrapper.eq(CaseEntity::getUserName,userName);
         wrapper.eq(CaseEntity::getType,0);
         wrapper.orderByDesc(CaseEntity::getCreateTime);

+ 2 - 4
src/main/java/com/fdkankan/fusion/service/impl/ModelServiceImpl.java

@@ -132,10 +132,8 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
             String deptId =  caseService.getDeptId(param.getCaseId());
             wrapper.eq(Model::getDeptId,deptId);
         }
-        if(StringUtils.isNotBlank(param.getDeptId())){
-            wrapper.eq(Model::getDeptId,param.getDeptId());
-        }
-        wrapper.in(Model::getDeptId,deptIds);
+        List<String> deptIds2 = tmDepartmentService.getSonByDeptIdAndDeptIds(deptIds, param.getDeptId());
+        wrapper.in(Model::getDeptId,deptIds2);
         wrapper.eq(Model::getType,3);
         wrapper.notIn(Model::getCreateStatus,-2);
         if(param.getStatus()!=null){    //参数2为成功,数据库中成功为1