diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java index e73d3b5a..bdd8ccf3 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java @@ -213,10 +213,13 @@ public class TAbilityApplicationController { put("apply_flag", applyFlag); // 限定 } }; + + /* 2022-11-16 去除对用户角色的判断,在后台能力统计处都可以看到申请详情 // 非超级管理员,只出本人 if (user.getSuperAdmin() == SuperAdminEnum.NO.value()) { params.put("user_id", user == null ? null : user.getId()); } + */ List applicationDTOS = tAbilityApplicationService.list(params); Map> result = applicationDTOS.stream().collect(Collectors.groupingBy(t -> { SysDeptDTO sysDeptDTO = t.getResourceOwnerDept(); @@ -443,4 +446,11 @@ public class TAbilityApplicationController { return new Result(); } + @GetMapping("getApplyDeptList") + @ApiOperation("/获取申请部门列表") + @LogOperation("/获取申请部门列表") + public Result getApplyDeptList() { + return new Result().ok(tAbilityApplicationService.getApplyDeptList()); + } + } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/dao/TAbilityApplicationDao.java b/renren-admin/src/main/java/io/renren/modules/processForm/dao/TAbilityApplicationDao.java index 37f4e35d..b76b42fe 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/dao/TAbilityApplicationDao.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/dao/TAbilityApplicationDao.java @@ -47,4 +47,6 @@ public interface TAbilityApplicationDao extends BaseDao getInstanceIdByResId(Long id); + + List getApplyDeptList(); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java index 7eeadb89..5d379a62 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java @@ -51,4 +51,11 @@ public interface TAbilityApplicationService extends CrudService implements TAbilityApplicationService { private static final Logger logger = LoggerFactory.getLogger(TAbilityApplicationServiceImpl.class); + private TAbilityApplicationDao abilityApplicationDao; @Override public QueryWrapper getWrapper(Map params) { @@ -131,5 +132,10 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl SELECT instance_id FROM t_ability_application WHERE resource_id = #{id} + + \ No newline at end of file diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index fe8b2de6..309a3f44 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -2322,6 +2322,7 @@ 1 = 1 AND tdr.del_flag = 0 AND tdr.dept_id = #{deptId} + AND tdr.type = '应用资源' AND tdr.name like CONCAT('%', #{key}, '%')