!6 同步develop分支

* sync -- 同步develop分支

ruoyi-system/src/main/resources/mapper/flowable/FlowCategoryMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.workflow.mapper.FlowCategoryMapper">
+
+    <resultMap type="com.ruoyi.workflow.domain.FlowCategory" id="FlowCategoryResult">
+        <result property="categoryId" column="category_id"/>
+        <result property="categoryName" column="category_name"/>
+        <result property="code" column="code"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+</mapper>

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -30,9 +30,9 @@
     <select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
-		<if test="deptId != null and deptId != 0">
-			AND dept_id = #{deptId}
-		</if>
+        <if test="deptId != null and deptId != 0">
+            AND dept_id = #{deptId}
+        </if>
         <if test="parentId != null and parentId != 0">
             AND parent_id = #{parentId}
         </if>
@@ -42,10 +42,6 @@
         <if test="status != null and status != ''">
             AND status = #{status}
         </if>
-<!--        &lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-<!--        <if test="params.dataScope != null and params.dataScope != ''">-->
-<!--            AND ( ${params.dataScope} )-->
-<!--        </if>-->
         order by d.parent_id, d.order_num
     </select>
 

ruoyi-system/src/main/resources/mapper/system/SysFormMapper.xml

@@ -27,7 +27,7 @@
         from sys_form
     </sql>
 
-    <select id="selectSysFormPage" parameterType="SysForm" resultMap="SysFormResult">
+    <select id="selectSysFormPage" resultMap="SysFormResult">
         <include refid="selectSysFormVo"/>
         <where>
             <if test="from.formName != null and from.formName != ''">
@@ -39,7 +39,7 @@
         </where>
     </select>
 
-    <select id="selectSysFormList" parameterType="SysForm" resultMap="SysFormResult">
+    <select id="selectSysFormList" resultMap="SysFormResult">
         <include refid="selectSysFormVo"/>
         <where>
             <if test="formName != null  and formName != ''">and form_name like concat('%', #{formName}, '%')</if>
@@ -52,7 +52,7 @@
         where form_id = #{formId}
     </select>
 
-    <insert id="insertSysForm" parameterType="SysForm" useGeneratedKeys="true" keyProperty="formId">
+    <insert id="insertSysForm" useGeneratedKeys="true" keyProperty="formId">
         insert into sys_form
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="formName != null">form_name,</if>
@@ -74,7 +74,7 @@
         </trim>
     </insert>
 
-    <update id="updateSysForm" parameterType="SysForm">
+    <update id="updateSysForm">
         update sys_form
         <trim prefix="SET" suffixOverrides=",">
             <if test="formName != null">form_name = #{formName},</if>

ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -12,8 +12,8 @@
         <result property="orderNum" column="order_num"/>
         <result property="path" column="path"/>
         <result property="component" column="component"/>
-		<result property="query" column="query"/>
-		<result property="isFrame" column="is_frame"/>
+        <result property="query" column="query"/>
+        <result property="isFrame" column="is_frame"/>
         <result property="isCache" column="is_cache"/>
         <result property="menuType" column="menu_type"/>
         <result property="visible" column="visible"/>
@@ -33,8 +33,8 @@
                         m.menu_name,
                         m.path,
                         m.component,
-						m.`query`,
-						m.visible,
+                        m.`query`,
+                        m.visible,
                         m.status,
                         ifnull(m.perms, '') as perms,
                         m.is_frame,
@@ -75,7 +75,7 @@
                         m.menu_name,
                         m.path,
                         m.component,
-					    m.`query`,
+                        m.`query`,
                         m.visible,
                         m.status,
                         ifnull(m.perms, '') as perms,

ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -60,10 +60,6 @@
         <if test="role.params.endTime != null and role.params.endTime != ''"><!-- 结束时间检索 -->
             and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{role.params.endTime},'%y%m%d')
         </if>
-<!--        &lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-<!--        <if test="role.params.dataScope != null and role.params.dataScope != ''">-->
-<!--            AND ( ${role.params.dataScope} )-->
-<!--        </if>-->
         order by r.role_sort
     </select>
 
@@ -88,10 +84,6 @@
         <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
             and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
         </if>
-<!--        &lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-<!--        <if test="params.dataScope != null and params.dataScope != ''">-->
-<!--            AND ( ${params.dataScope} )-->
-<!--        </if>-->
         order by r.role_sort
     </select>
 

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -75,9 +75,9 @@
                r.data_scope,
                r.status as role_status
         from sys_user u
-		    left join sys_dept d on u.dept_id = d.dept_id
-		    left join sys_user_role ur on u.user_id = ur.user_id
-		    left join sys_role r on r.role_id = ur.role_id
+            left join sys_dept d on u.dept_id = d.dept_id
+            left join sys_user_role ur on u.user_id = ur.user_id
+            left join sys_role r on r.role_id = ur.role_id
     </sql>
 
     <select id="selectPageUserList" parameterType="SysUser" resultMap="SysUserResult">
@@ -108,10 +108,6 @@
             AND (u.dept_id = #{user.deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{user.deptId},
             ancestors) ))
         </if>
-<!--        &lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-<!--        <if test="user.params.dataScope != null and user.params.dataScope != ''">-->
-<!--            AND ( ${user.params.dataScope} )-->
-<!--        </if>-->
     </select>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
@@ -142,10 +138,6 @@
             AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},
             ancestors) ))
         </if>
-<!--        &lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-<!--        <if test="params.dataScope != null and params.dataScope != ''">-->
-<!--            AND ( ${params.dataScope} )-->
-<!--        </if>-->
     </select>
 
     <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
@@ -161,10 +153,6 @@
         <if test="user.phonenumber != null and user.phonenumber != ''">
             AND u.phonenumber like concat('%', #{user.phonenumber}, '%')
         </if>
-<!--        &lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-<!--        <if test="user.params.dataScope != null and user.params.dataScope != ''">-->
-<!--            AND ( ${user.params.dataScope} )-->
-<!--        </if>-->
     </select>
 
     <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
@@ -181,10 +169,6 @@
         <if test="user.phonenumber != null and user.phonenumber != ''">
             AND u.phonenumber like concat('%', #{user.phonenumber}, '%')
         </if>
-<!--        &lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-<!--        <if test="user.params.dataScope != null and user.params.dataScope != ''">-->
-<!--            AND ( ${user.params.dataScope} )-->
-<!--        </if>-->
     </select>
 
     <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">