From 8e906778f25adef71e0de84a0c52f21da4348a15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Wed, 9 Oct 2024 18:00:53 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BA=BA=E6=96=B9=E6=B3=95=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8A=A5=E9=94=80=E5=8D=95=E7=B1=BB=E5=9E=8B=EF=BC=9B?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=96=B9=E6=B3=95=EF=BC=8C=E8=A1=A5=E5=85=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/todoitem/service/impl/BizTodoItemServiceImpl.java | 2 +-
 .../src/main/resources/mapper/system/SysUserMapper.xml        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java b/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java
index da671d6b..dcdf98a6 100644
--- a/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java
+++ b/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java
@@ -184,7 +184,7 @@ public class BizTodoItemServiceImpl implements IBizTodoItemService {
             } else {
                 // 查询候选用户组，系统用户角色视图，group是角色
                 List<String> todoUserIdList = new ArrayList<>();
-                if("requisitioning".equals(module)){
+                if("requisitioning".equals(module)||module.equals("expense")){
                     todoUserIdList = bizTodoItemMapper.selectTodoUserListsByTaskId(task.getId());
                 }else{
                     todoUserIdList = bizTodoItemMapper.selectTodoUserListByTaskId(task.getId());
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index efaab6d3..6285e139 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -268,7 +268,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectLoginNameByUserName" parameterType="String" resultType="String">
        	select login_name from sys_user where del_flag = '0' and user_name = #{userName}
 	</select>
+
 	<select id="selectUserAll"  resultMap="SysUserResult">
-		select login_name,user_name from sys_user where del_flag = '0'
+        <include refid="selectUserVo"/>
+		where u.del_flag = '0'
 	</select>
 </mapper> 
\ No newline at end of file