ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1384,6 +1384,13 @@ } @GetMapping("/deptTree111") @ApiOperation("获取部门树列表1111111111") public AjaxResult deptTree111(SysDept dept) { return success(deptService.selectDeptTreeList1(dept)); } /** * 获取子科室部门列表 */ ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ltkj.common.core.domain.entity.SysDept; import com.ltkj.common.core.redis.RedisCache; import com.ltkj.common.utils.bean.BeanUtils; import com.ltkj.framework.datasource.DynamicDataSourceContextHolder; import com.ltkj.hosp.domain.*; @@ -61,6 +62,8 @@ private ITjRulesService tjRulesService; @Resource private TestMapper testMapper; @Resource private RedisCache redisCache; @GetMapping("/getTjHyBgList") @@ -87,19 +90,13 @@ if (tjProjects != null) { for (TjProject project : tjProjects) { LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>(); wq1.eq(TjProject::getProParentId, project.getProId()); if(null !=proName) { wq1.like(TjProject::getProName, proName); } List<TjProject> projectList = tjProjectService.list(wq1); List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId())); project.setTjProjectList(projectList); SysDept sysDept = deptService.selectDeptById(project.getDeptId()); if (sysDept!=null){ project.setDeptName(sysDept.getDeptName()); } } } String key = configService.selectConfigByKey("is_open_sfxm"); ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java
@@ -5,6 +5,7 @@ import java.util.Map; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ltkj.common.core.domain.TreeSelect; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import com.ltkj.common.core.domain.entity.SysDept; @@ -25,6 +26,10 @@ */ public List<SysDept> selectDeptList(SysDept dept); @Select("SELECT * FROM v_tj_deptpro") public List<SysDept> selectDeptTreeList1(); /** * 根据角色ID查询部门树信息 * ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java
@@ -22,6 +22,7 @@ * @return 部门信息集合 */ public List<SysDept> selectDeptList(SysDept dept); public List<SysDept> selectDeptList11(SysDept dept); /** * 查询部门树结构信息 @@ -31,6 +32,8 @@ */ public List<TreeSelect> selectDeptTreeList(SysDept dept); public List<TreeSelect> selectDeptTreeList1(SysDept dept); /** * 构建前端所需要树结构 * ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java
@@ -50,6 +50,12 @@ return deptMapper.selectDeptList(dept); } @Override @DataScope(deptAlias = "d") public List<SysDept> selectDeptList11(SysDept dept) { return deptMapper.selectDeptTreeList1(); } /** * 查询部门树结构信息 * @@ -62,6 +68,12 @@ return buildDeptTreeSelect(depts); } @Override public List<TreeSelect> selectDeptTreeList1(SysDept dept) { List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList11(dept); return buildDeptTreeSelect(depts); } /** * 构建前端所需要树结构 *