Merge branch 'master' into docker_package

Merge branch 'dev'
...
2023-01-10 10:05:50 +08:00 · 2023-01-10 10:05:42 +08:00 · 2023-01-10 10:05:13 +08:00
1 changed files with 1 additions and 1 deletions
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
@ -2385,7 +2385,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
            List<Map<String, Object>> lcDept = sysDeptDao.selectLCDeptByUcsDeptName(params.get("deptId").toString());
            if (lcDept.isEmpty()) {
                logger.error("未查询到{}对应的浪潮系统部门", params.get("deptId").toString());
-                return new ArrayList<>();
+//                return new ArrayList<>();
            } else {
                StringBuilder sb = new StringBuilder("SELECT  " +
                        "  COUNT( BSNUM ) AS \"count\",  " +
Author	SHA1	Message	Date
wangliwen	22b103c5a0	Merge branch 'master' into docker_package	2023-01-10 10:05:50 +08:00
wangliwen	cc1ae60000	Merge branch 'dev'	2023-01-10 10:05:42 +08:00
wangliwen	36fe1f08e2	...	2023-01-10 10:05:13 +08:00