From ab2af1669c9169009ba15ec4a152185a262633e2 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: 星期一, 25 三月 2024 23:30:05 +0800 Subject: [PATCH] add 添加流程办理校验,添加部署后如果流程定义最高版本有表单配置将此版本配置同步到部署得流程定义 --- 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 fedf820..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.SysDept" 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