From f13b9d2764b3c291be550c362c890149771dd9e5 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期六, 25 五月 2024 10:07:21 +0800 Subject: [PATCH] !540 流程任务办理时校验是否是任务办理人优化 Merge pull request !540 from 时光/dev-check-curruser-task --- ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 80aa428..6ad866f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,13 +2,24 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.ruoyi.system.mapper.SysDeptMapper"> +<mapper namespace="org.dromara.system.mapper.SysDeptMapper"> - <resultMap type="com.ruoyi.system.domain.vo.SysDeptVo" id="SysDeptResult"> + <resultMap type="org.dromara.system.domain.vo.SysDeptVo" id="SysDeptResult"> </resultMap> <select id="selectDeptList" resultMap="SysDeptResult"> - select * from sys_dept ${ew.getCustomSqlSegment} + select + <if test="ew.getSqlSelect != null"> + ${ew.getSqlSelect} + </if> + <if test="ew.getSqlSelect == null"> + * + </if> + from sys_dept ${ew.getCustomSqlSegment} + </select> + + <select id="countDeptById" resultType="Long"> + select count(*) from sys_dept where del_flag = '0' and dept_id = #{deptId} </select> <select id="selectDeptListByRoleId" resultType="Long"> -- Gitblit v1.9.3