From fccfe7d50f42f5be4c4612d61b7ae852e2ef37cd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 17 四月 2025 15:26:09 +0800
Subject: [PATCH] 优化指派设备与审签设备的权限校验查询,新增导入电子样板触发审签流程,新增电子样板指派设备功能

---
 lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/mapper/xml/WorkTaskVoMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/mapper/xml/WorkTaskVoMapper.xml b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/mapper/xml/WorkTaskVoMapper.xml
index 4137c80..81e862f 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/mapper/xml/WorkTaskVoMapper.xml
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/mapper/xml/WorkTaskVoMapper.xml
@@ -13,8 +13,9 @@
             atask.priority_ AS priority,
             atask.create_time_ AS createTime,
             atask.suspension_state_ AS suspensionState,
+            atask.ASSIGNEE_ as assignee,
             fmb.act_status AS actStatus,
-            fmb.title AS title,
+            fmb.title AS 'description',
             fmb.data_id AS dataId,
             fmb.process_definition_key AS processDefinitionKey,
             fmb.process_definition_id AS processDefinitionId,
@@ -26,7 +27,9 @@
             LEFT JOIN flow_my_business fmb on atask.id_ = fmb.task_id
             LEFT JOIN ACT_RE_PROCDEF pro on atask.PROC_DEF_ID_ = pro.id_
         WHERE
-            atask.assignee_ = #{flowMy.username}
+            (atask.assignee_ = #{flowMy.username}
+                OR ( atask.assignee_ IS NULL AND fmb.todo_users LIKE CONCAT('%',#{flowMy.username},'%'))
+                )
           <if test="flowMy.flowName!= null and flowMy.flowName!= ''">
               AND pro.name_ LIKE CONCAT('%',#{flowMy.flowName},'%')
           </if>

--
Gitblit v1.9.3