From 274cbd9de86f7b76d797cd45d18b737ffedb12f9 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Thu, 15 Dec 2022 13:52:34 +0800
Subject: [PATCH] ...

---
 .../renren/modules/activiti/controller/ActTaskController.java | 1 +
 .../renren/modules/activiti/controller/HistoryController.java | 4 ++++
 2 files changed, 5 insertions(+)

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 0a7063a2..155de48a 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
@@ -141,6 +141,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() + " 拥有会客厅权限");
                 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 1369250c..4382882f 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
@@ -38,6 +38,8 @@ import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.history.HistoricProcessInstanceQuery;
 import org.activiti.engine.task.Task;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -63,6 +65,7 @@ import java.util.stream.Collectors;
 @RequestMapping("/act/his")
 @Api(tags = "流程历史")
 public class HistoryController {
+    private static final Logger logger = LoggerFactory.getLogger(HistoryController.class);
 
     @Autowired
     protected HistoryService historyService_;
@@ -143,6 +146,7 @@ public class HistoryController {
         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()) { // 拥有会客厅审核权限
+                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);
                 Integer limit = 10;