From db11899094935bff119e683de65ff7ac03e97464 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Thu, 15 Dec 2022 14:27:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../renren/modules/activiti/controller/ActTaskController.java | 3 +--
 .../renren/modules/activiti/controller/HistoryController.java | 4 ++--
 renren-admin/src/main/resources/application-dev.yml           | 3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java b/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java
index 155de48a..862604f4 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java
@@ -140,8 +140,7 @@ public class ActTaskController {
          */
         if (!(params.containsKey("processDefinitionKey") && org.apache.commons.lang3.StringUtils.isNotEmpty(params.get("processDefinitionKey").toString()))) {
             List<Long> useIds = sysRoleUserService.getUserIdListByRoleId(Long.parseLong(defaultAssigneeRoleId));
-            if (useIds.stream().filter(index -> index == SecurityUser.getUserId()).findFirst().isPresent()) { // 拥有会客厅审核权限
-                logger.info(SecurityUser.getUserId() + " 拥有会客厅权限");
+            if (useIds.contains(Long.parseLong(userId))) { // 拥有会客厅审核权限
                 int meetingroom_book = jdbcTemplate.queryForObject("SELECT COUNT(id) FROM t_meetingroom_book WHERE state = 1;", Integer.class);
                 page.setTotal(page.getTotal() + meetingroom_book);
                 Integer limit = 10;
diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java
index 4382882f..e6014f51 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java
@@ -143,9 +143,9 @@ public class HistoryController {
             params.replace("processDefinitionKey", params.get("processDefinitionKey").toString() + "%");
         }
         PageData<ProcessActivityDTO> page = activitiService.getMyProcessInstancePage(params);
-        List<Long> useIds = sysRoleUserService.getUserIdListByRoleId(Long.parseLong(defaultAssigneeRoleId));
         if (!(params.containsKey("processDefinitionKey") && org.apache.commons.lang3.StringUtils.isNotEmpty(params.get("processDefinitionKey").toString()))) {
-            if (useIds.stream().filter(index -> index == SecurityUser.getUserId()).findFirst().isPresent()) { // 拥有会客厅审核权限
+            List<Long> useIds = sysRoleUserService.getUserIdListByRoleId(Long.parseLong(defaultAssigneeRoleId));
+            if (useIds.contains(SecurityUser.getUserId())) { // 拥有会客厅审核权限
                 logger.info(SecurityUser.getUserId() + " 拥有会客厅权限");
                 int meetingroom_book = jdbcTemplate.queryForObject("SELECT COUNT(id) FROM t_meetingroom_book WHERE state != 1;", Integer.class);
                 page.setTotal(page.getTotal() + meetingroom_book);
diff --git a/renren-admin/src/main/resources/application-dev.yml b/renren-admin/src/main/resources/application-dev.yml
index a21e26f4..c1fe0803 100644
--- a/renren-admin/src/main/resources/application-dev.yml
+++ b/renren-admin/src/main/resources/application-dev.yml
@@ -72,6 +72,9 @@ big_date:
   assignee_role_name: 部门审批人
   assignee_district_role_name: 区审批人
   assignee_city_role_name: 市审批人
+  # 会客厅审核员角色
+  assignee_meet_role_id: 1599681595457933313
+
   # 平台部署级别 (PROVINCE:省 PREFECTURE:地级市 DISTRICT:区县 STREET:街道)
   stage: PREFECTURE