!4 同步develop分支

* fix -- 修改获取流程节点信息接口（供前端渲染流程跟踪图着色使用）
* fix -- 修复流程跟踪着色问题
* fix -- 采用ProcessViewer组件显示流程跟踪信息
* fix -- 整合表单设计代码
* fix -- 简易实现用户任务选择用户下拉框内容
* fix -- 修改项目介绍及sql文件
* del -- 移除未使用的文件
* fix -- 修复组件无法显示和修改的问题
* add -- 整合 Rtony/RuoYi-flowable 工作流
* add -- 添加process-designer流程设计插件
* !3 同步ruoyi-vue-plus更新
* !2 登录认证用户信息添加nickName字段（流程任务需要使用到）

ruoyi-system/src/main/resources/mapper/package-info.md

@@ -0,0 +1,3 @@
+java包使用 `.` 分割 resource 目录使用 `/` 分割
+<br>
+此文件目的 防止文件夹粘连找不到 `xml` 文件

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

@@ -42,17 +42,17 @@
         <if test="status != null and status != ''">
             AND status = #{status}
         </if>
-        <!-- 数据范围过滤 -->
-        <if test="params.dataScope != null and params.dataScope != ''">
-            AND ( ${params.dataScope} )
-        </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>
 
-    <select id="selectDeptListByRoleId" resultType="Integer">
+    <select id="selectDeptListByRoleId" resultType="Long">
         select d.dept_id
         from sys_dept d
-        left join sys_role_dept rd on d.dept_id = rd.dept_id
+            left join sys_role_dept rd on d.dept_id = rd.dept_id
         where rd.role_id = #{roleId}
             <if test="deptCheckStrictly">
                 and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})

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

@@ -27,33 +27,13 @@
         <result property="remark" column="remark"/>
     </resultMap>
 
-    <sql id="selectMenuVo">
-        select menu_id,
-               menu_name,
-               parent_id,
-               order_num,
-               path,
-               component,
-			   query,
-               is_frame,
-               is_cache,
-               menu_type,
-               visible,
-               status,
-               ifnull(perms, '') as perms,
-               icon,
-               create_time
-        from sys_menu
-    </sql>
-
-
     <select id="selectMenuTreeAll" resultMap="SysMenuResult">
         select distinct m.menu_id,
                         m.parent_id,
                         m.menu_name,
                         m.path,
                         m.component,
-						m.query,
+						m.`query`,
 						m.visible,
                         m.status,
                         ifnull(m.perms, '') as perms,
@@ -70,7 +50,7 @@
     </select>
 
     <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
-        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status,
+        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status,
         ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
         from sys_menu m
         left join sys_role_menu rm on m.menu_id = rm.menu_id
@@ -95,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/SysPostMapper.xml

@@ -29,7 +29,7 @@
         from sys_post
     </sql>
 
-    <select id="selectPostListByUserId" parameterType="Long" resultType="Integer">
+    <select id="selectPostListByUserId" parameterType="Long" resultType="Long">
         select p.post_id
         from sys_post p
                  left join sys_user_post up on up.post_id = p.post_id
@@ -45,4 +45,4 @@
         where u.user_name = #{userName}
     </select>
 
-</mapper> 
+</mapper>

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

@@ -60,10 +60,10 @@
         <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>
-        <!-- 数据范围过滤 -->
-        <if test="role.params.dataScope != null and role.params.dataScope != ''">
-            AND ( ${role.params.dataScope} )
-        </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 +88,10 @@
         <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>
-        <!-- 数据范围过滤 -->
-        <if test="params.dataScope != null and params.dataScope != ''">
-            AND ( ${params.dataScope} )
-        </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

@@ -108,10 +108,10 @@
             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>
-        <!-- 数据范围过滤 -->
-        <if test="user.params.dataScope != null and user.params.dataScope != ''">
-            AND ( ${user.params.dataScope} )
-        </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 +142,10 @@
             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>
-        <!-- 数据范围过滤 -->
-        <if test="params.dataScope != null and params.dataScope != ''">
-            AND ( ${params.dataScope} )
-        </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 +161,10 @@
         <if test="user.phonenumber != null and user.phonenumber != ''">
             AND u.phonenumber like concat('%', #{user.phonenumber}, '%')
         </if>
-        <!-- 数据范围过滤 -->
-        <if test="user.params.dataScope != null and user.params.dataScope != ''">
-            AND ( ${user.params.dataScope} )
-        </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 +181,10 @@
         <if test="user.phonenumber != null and user.phonenumber != ''">
             AND u.phonenumber like concat('%', #{user.phonenumber}, '%')
         </if>
-        <!-- 数据范围过滤 -->
-        <if test="user.params.dataScope != null and user.params.dataScope != ''">
-            AND ( ${user.params.dataScope} )
-        </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">