Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-12-10 20:18:30 +08:00
commit 5c65ca315d
1 changed files with 4 additions and 1 deletions

View File

@ -2808,7 +2808,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
if (params.get("provideDept") != null) {
Map<String, Object> lcDept = sysDeptDao.selectLCDeptByUcsDeptName(params.get("provideDept").toString());
if (lcDept.isEmpty() || org.apache.commons.lang3.StringUtils.isBlank(lcDept.get("lc_name").toString())) {
if (lcDept.isEmpty()
|| lcDept.get("lc_name") == null
|| (lcDept.get("lc_name") != null && org.apache.commons.lang3.StringUtils.isBlank(lcDept.get("lc_name").toString()))
) {
logger.error("未查询到{}对应的浪潮系统部门", params.get("provideDept").toString());
return new ArrayList<>();
}