From 16bbcdc3e3d9646d41c0bacf162f076cb1fcc581 Mon Sep 17 00:00:00 2001
From: lj7788 <lj7788@126.com>
Date: Wed, 27 Aug 2025 12:29:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dflow=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FlowBusinessKeyController.java  | 18 +++++++++++-------
 .../src/main/resources/logback.xml             |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java
index edfc8786..c1d76380 100644
--- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java
+++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java
@@ -166,6 +166,7 @@ public class FlowBusinessKeyController extends BaseController {
     @GetMapping(value = "/myAwaitFlowTaskList")
     public TableDataInfo myAwaitFlowTaskList(FlowTaskEntity flowTaskEntity) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
+        Long projectId=loginUser.getSysUser().getActiveProjectId();
         if(StringUtils.isNotEmpty(flowTaskEntity.getStartProId())){
             // 小程序查询会走这里
             flowTaskEntity.setAssigneeId(SecurityUtils.getUserId());
@@ -179,21 +180,21 @@ public class FlowBusinessKeyController extends BaseController {
         }else{
             if(SecurityUtils.isAdmin(loginUser.getUserid())){
                 // 超管查询所有申请...
-                if(Objects.nonNull(loginUser.getProjectDeptId())){
-                    flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId()));
+                if(Objects.nonNull(projectId)){
+                    flowTaskEntity.setStartComId(Convert.toStr(projectId));
                 }
-                if(Objects.nonNull(loginUser.getProjectId())){
-                    flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId()));
+                if(Objects.nonNull(projectId)){
+                    flowTaskEntity.setStartProId(Convert.toStr(projectId));
                 }
             }else if(SecurityUtils.isGSAdmin()){
                 // 公司管理员查询公司内的所有申请...
                 flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId()));
-                if(Objects.nonNull(loginUser.getProjectId())){
-                    flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId()));
+                if(Objects.nonNull(projectId)){
+                    flowTaskEntity.setStartProId(Convert.toStr(projectId));
                 }
             }else if(SecurityUtils.isXMAdmin()){
                 // 公司管理员查询公司内的所有申请...
-                flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId()));
+                flowTaskEntity.setStartProId(Convert.toStr(projectId));
             }else{
                 flowTaskEntity.setAssigneeId(SecurityUtils.getUserId());
                 if(loginUser.getSysUser().getRoles().size()>0){
@@ -218,6 +219,9 @@ public class FlowBusinessKeyController extends BaseController {
     public TableDataInfo myFinishedFlowTaskList(FlowTaskEntity flowTaskEntity) {
         startPage();
         flowTaskEntity.setAssigneeId(SecurityUtils.getUserId());
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Long projectId=loginUser.getSysUser().getActiveProjectId();
+        flowTaskEntity.setStartProId(Convert.toStr(projectId));
         return getDataTable(flowBusinessKeyService.selectMyFinishedFlowTask(flowTaskEntity));
     }
 
diff --git a/yanzhu-modules/yanzhu-flowable/src/main/resources/logback.xml b/yanzhu-modules/yanzhu-flowable/src/main/resources/logback.xml
index ed048b14..a6429935 100644
--- a/yanzhu-modules/yanzhu-flowable/src/main/resources/logback.xml
+++ b/yanzhu-modules/yanzhu-flowable/src/main/resources/logback.xml
@@ -58,7 +58,7 @@
     </appender>
 
     <!-- 系统模块日志级别控制  -->
-	<logger name="com.yanzhu" level="info" />
+	<logger name="com.yanzhu" level="debug" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />