From 67f8811b21e4586d953a63f631ea59c0fd853927 Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Thu, 21 Jul 2022 15:40:52 +0800
Subject: [PATCH] ...

---
 .../java/io/renren/modules/activiti/service/ActTaskService.java | 2 --
 renren-admin/src/main/resources/mapper/resource/ResourceDao.xml | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
index 1380766c..8e85a94e 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
@@ -209,8 +209,6 @@ public class ActTaskService extends BaseServiceImpl {
         for (Task task : list) {
             TaskDTO dto = new TaskDTO();
             this.convertTaskInfo(task, dto);
-            //Optional<SysUserEntity> sysUserEntity = Optional.ofNullable(sysUserService.selectById(dto.getUserId()));
-            //dto.setUserName(sysUserEntity.get().getRealName());
             Map<String, Object> processVariable = new LinkedHashMap<>();
 
             if (dto.getBusinessKey().startsWith("{") || dto.getBusinessKey().startsWith("[")) { // 为json内容 (特殊处理批量)
diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index bea045eb..a345f083 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -791,6 +791,7 @@
         WHERE 1 = 1
         AND del_flag = 0
         AND dept_id = #{deptId}
+        LIMIT 30
     </select>
 
     <select id="selectDeptCountList" resultType="java.util.Map">
@@ -857,6 +858,7 @@
         AND su.id = taa.user_id
         AND taa.resource_id = tdr.id
         AND su.dept_id = #{deptId}
+        LIMIT 30
     </select>
 
     <select id="selectApplyDeptCountList" resultType="java.util.Map">