From b713df68154adc79e6062b645d7d8e70c0d872fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Mon, 25 Dec 2023 00:53:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/system/domain/FlowTaskEntity.java   | 2 +-
 .../main/resources/mapper/flowable/FlowBusinessKeyMapper.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/FlowTaskEntity.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/FlowTaskEntity.java
index a9acf4e8..352465c4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/FlowTaskEntity.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/FlowTaskEntity.java
@@ -99,7 +99,7 @@ public class FlowTaskEntity extends BaseEntity{
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date finishTime;
 
-    private  long deptId;
+    private long deptId;
     private long projectId;
 
     public long getDeptId() {
diff --git a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
index 4725decc..cad55f27 100644
--- a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
@@ -372,7 +372,7 @@
             <if test="procDefKey != null  and procDefKey != ''"> and fa.procDefKey = #{procDefKey}</if>
             <if test="businessKey != null  and businessKey != ''"> and fa.businessKey = #{businessKey}</if>
             <!-- 查询条件-项目部门 -->
-            <if test="projectDeptId != null "> and fa.businessDeptId = #{projectDeptId}</if>
+            <if test="projectDeptId != null and projectDeptId != ''"> and fa.businessDeptId = #{projectDeptId}</if>
         </where>
         order by fa.createTime desc
     </select>