Browse Source

[fix]

修改选择待办人方法,添加报销单类型;
修改选择所有用户方法,补全字段;
dev
王晓迪 2 months ago
parent
commit
8e906778f2
  1. 2
      ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java
  2. 4
      ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

2
ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java

@ -184,7 +184,7 @@ public class BizTodoItemServiceImpl implements IBizTodoItemService {
} else { } else {
// 查询候选用户组,系统用户角色视图,group是角色 // 查询候选用户组,系统用户角色视图,group是角色
List<String> todoUserIdList = new ArrayList<>(); List<String> todoUserIdList = new ArrayList<>();
if("requisitioning".equals(module)){ if("requisitioning".equals(module)||module.equals("expense")){
todoUserIdList = bizTodoItemMapper.selectTodoUserListsByTaskId(task.getId()); todoUserIdList = bizTodoItemMapper.selectTodoUserListsByTaskId(task.getId());
}else{ }else{
todoUserIdList = bizTodoItemMapper.selectTodoUserListByTaskId(task.getId()); todoUserIdList = bizTodoItemMapper.selectTodoUserListByTaskId(task.getId());

4
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 id="selectLoginNameByUserName" parameterType="String" resultType="String">
select login_name from sys_user where del_flag = '0' and user_name = #{userName} select login_name from sys_user where del_flag = '0' and user_name = #{userName}
</select> </select>
<select id="selectUserAll" resultMap="SysUserResult"> <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> </select>
</mapper> </mapper>
Loading…
Cancel
Save