From b8de1070fccad4237e5e1331601fde374d92fc05 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Mon, 11 Jul 2022 11:08:21 +0800
Subject: [PATCH 1/2] ...

---
 .../io/renren/modules/sys/controller/SysDeptController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/sys/controller/SysDeptController.java b/renren-admin/src/main/java/io/renren/modules/sys/controller/SysDeptController.java
index 90101897..65bf5687 100644
--- a/renren-admin/src/main/java/io/renren/modules/sys/controller/SysDeptController.java
+++ b/renren-admin/src/main/java/io/renren/modules/sys/controller/SysDeptController.java
@@ -48,7 +48,7 @@ public class SysDeptController {
     public Result<List<Map<String, Object>>> all(String name) {
         List<Map<String, Object>> list = new ArrayList<>();
         if (StringUtils.isNotEmpty(name)) {
-            list = jdbcTemplate.queryForList(String.format("SELECT id,`name` FROM sys_dept WHERE `name` LIKE '%s';", name));
+            list = jdbcTemplate.queryForList(String.format("SELECT id,`name` FROM sys_dept WHERE `name` LIKE '%s';", "%" + name + "%"));
         } else {
             list = jdbcTemplate.queryForList("SELECT id,`name` FROM sys_dept;");
         }

From 9abc6bf96ec9b9cedf9507d92612811154b39596 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Mon, 11 Jul 2022 11:27:04 +0800
Subject: [PATCH 2/2] npe

---
 .../resource/service/impl/ResourceServiceImpl.java       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git 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
index 73150fed..1581bc2f 100644
--- 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
@@ -14,7 +14,6 @@ import io.renren.common.constant.Constant;
 import io.renren.common.domain.Tsingtao_xhaProperties;
 import io.renren.common.page.PageData;
 import io.renren.common.service.impl.CrudServiceImpl;
-import io.renren.common.utils.ConvertUtils;
 import io.renren.common.utils.DateUtils;
 import io.renren.modules.monitor.dto.CameraChannelDto1;
 import io.renren.modules.monitor.entity.CameraChannel;
@@ -859,6 +858,9 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     public Object capabilitySharePartyCapabilitySet() {
         HashMap<String, Object> resultMap = new HashMap<>();
         List<Long> deptIds = resourceDao.selectMaxDeptIds();
+        if (deptIds.isEmpty()) {
+            return resultMap;
+        }
         List<Map> resourceList = resourceDao.selectByDeptId(deptIds.get(0));
         HashMap<String, Object> maxdeptMap = new HashMap<>();
         maxdeptMap.put("resourceList", resourceList);
@@ -879,6 +881,9 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     public Object competencyApplicantCompetencySet() {
         HashMap<String, Object> resultMap = new HashMap<>();
         List<Long> deptIds = resourceDao.selectMaxApplyDeptIds();
+        if (deptIds.isEmpty()) {
+            return resultMap;
+        }
         List<Map> resourceList = resourceDao.selectByApplyDeptId(deptIds.get(0));
         HashMap<String, Object> maxdeptMap = new HashMap<>();
         maxdeptMap.put("resourceList", resourceList);
@@ -1617,7 +1622,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
             limit = Integer.parseInt((String) params.get(Constant.LIMIT));
         }
         List<SysUserDTO> sysUserList = sysUserService.list(new HashMap());
-        List<ResourceDTO> result=resourceDao.selectUsersApplyAndCount(sysUserList.stream().map(dto->dto.getId()).collect(Collectors.toList()));
+        List<ResourceDTO> result = resourceDao.selectUsersApplyAndCount(sysUserList.stream().map(dto -> dto.getId()).collect(Collectors.toList()));
         int j = Math.min(curPage * limit, result.size());
         ArrayList<ResourceDTO> recordLists = new ArrayList<>();
         for (int i = (curPage - 1) * limit; i < j; i++) {