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

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-12-10 20:29:04 +08:00
parent 5c65ca315d 1663277e9c
commit 2dca64b91f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -2808,6 +2808,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
if (params.get("provideDept") != null) { if (params.get("provideDept") != null) {
Map<String, Object> lcDept = sysDeptDao.selectLCDeptByUcsDeptName(params.get("provideDept").toString()); Map<String, Object> lcDept = sysDeptDao.selectLCDeptByUcsDeptName(params.get("provideDept").toString());
try {
if (lcDept.isEmpty() if (lcDept.isEmpty()
|| lcDept.get("lc_name") == null || lcDept.get("lc_name") == null
|| (lcDept.get("lc_name") != null && org.apache.commons.lang3.StringUtils.isBlank(lcDept.get("lc_name").toString())) || (lcDept.get("lc_name") != null && org.apache.commons.lang3.StringUtils.isBlank(lcDept.get("lc_name").toString()))
@ -2816,6 +2817,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
return new ArrayList<>(); return new ArrayList<>();
} }
sb.append(" AND apply.\"resourceDeptName\" = ").append(lcDept.get("lc_name").toString()); sb.append(" AND apply.\"resourceDeptName\" = ").append(lcDept.get("lc_name").toString());
} catch (Exception e) {
logger.error("", e);
return new ArrayList<>();
}
} }
if (params.get("region") != null) { if (params.get("region") != null) {
List<String> deptNames = sysDeptDao.selectLCDeptByRegion((Long) params.get("region")); List<String> deptNames = sysDeptDao.selectLCDeptByRegion((Long) params.get("region"));