wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

...

This commit is contained in:
wangliwen 2023-01-10 18:17:56 +08:00
parent defb11ee00
commit 451a5629de
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
View File

@ -805,6 +805,12 @@ public class TAbilityApplicationController {
temp.put("system", index.getSystem()); temp.put("system", index.getSystem());
temp.put("resourceId", index.getResourceId()); temp.put("resourceId", index.getResourceId());
ResourceDTO resourceDTO = resourceService.get(Long.parseLong(index.getResourceId())); ResourceDTO resourceDTO = resourceService.get(Long.parseLong(index.getResourceId()));
try {
temp.put("resourceDept", sysDeptService.get(resourceDTO.getDeptId()).getName());
} catch (Exception exception) {
temp.put("resourceDept", "-");
}
temp.put("", resourceDTO.getDescription());
if ("应用资源".equals(resourceDTO.getType())) { if ("应用资源".equals(resourceDTO.getType())) {
temp.put("resourceTYpe", "应用资源"); temp.put("resourceTYpe", "应用资源");
} else if ("组件服务".equals(resourceDTO.getType())) { } else if ("组件服务".equals(resourceDTO.getType())) {

4
renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
View File

@ -85,9 +85,9 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
String sql = "SELECT 1 FROM tb_resource_score t1 WHERE t1.user_id = t_ability_application.user_id AND t1.resource_id = t_ability_application.resource_id"; String sql = "SELECT 1 FROM tb_resource_score t1 WHERE t1.user_id = t_ability_application.user_id AND t1.resource_id = t_ability_application.resource_id";
String resource_sql = "SELECT 1 FROM tb_data_resource WHERE tb_data_resource.del_flag = 0 AND t_ability_application.resource_id = tb_data_resource.id"; String resource_sql = "SELECT 1 FROM tb_data_resource WHERE tb_data_resource.del_flag = 0 AND t_ability_application.resource_id = tb_data_resource.id";
if (score) { if (score) {
wrapper.exists(sql).exists(resource_sql).ne("approve_status", "不通过"); wrapper.exists(sql).exists(resource_sql).eq("approve_status", "通过");
} else { } else {
wrapper.notExists(sql).exists(resource_sql).ne("approve_status", "不通过"); wrapper.notExists(sql).exists(resource_sql).eq("approve_status", "通过");
} }
break; break;
} }