Merge branch 'dev'
This commit is contained in:
commit
6929e5cd3e
|
@ -803,7 +803,7 @@ public class TAbilityApplicationController {
|
||||||
temp.put("createDate", index.getCreateDate());
|
temp.put("createDate", index.getCreateDate());
|
||||||
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.selectWithAttrs(Long.parseLong(index.getResourceId()));
|
||||||
if ("应用资源".equals(resourceDTO.getType())) {
|
if ("应用资源".equals(resourceDTO.getType())) {
|
||||||
temp.put("resourceTYpe", "应用资源");
|
temp.put("resourceTYpe", "应用资源");
|
||||||
} else if ("组件服务".equals(resourceDTO.getType())) {
|
} else if ("组件服务".equals(resourceDTO.getType())) {
|
||||||
|
|
Loading…
Reference in New Issue