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 44d874a3..01dc373d 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 @@ -805,6 +805,12 @@ public class TAbilityApplicationController { temp.put("system", index.getSystem()); temp.put("resourceId", 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())) { temp.put("resourceTYpe", "应用资源"); } else if ("组件服务".equals(resourceDTO.getType())) { diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java index 6515baa7..0476efb0 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java @@ -85,9 +85,9 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl