数据权限的修改

mhd-user-center/src/main/resources/mapper/RoleMapper.xml

@@ -25,6 +25,8 @@
         a.role_id,
         a.parent_role_id,
         a.organization_id,
+        a.organization_name AS organizationName,
+        a.top_organization_id AS topOrganizationId,
         a.role_code,
         a.role_name,
         a.role_remark,
@@ -51,6 +53,7 @@
         a.del_flag = 1
         <include refid="common_where"></include>
         GROUP BY a.role_id
+        ORDER BY COALESCE(a.update_time, a.create_time) DESC
     </select>
     <select id="selectByOrganizationIdAndRoleCode"
             parameterType="com.mhd.user.domain.roleAggregate.repository.todo.RoleDo"
@@ -119,6 +122,16 @@
         </if>
         <if test="organizationId !=null">
             and a.organization_id = #{organizationId}
+            and a.organization_name IS NOT NULL
+        </if>
+        <if test="topOrganizationId !=null">
+            and a.top_organization_id = #{topOrganizationId}
+            <if test="organizationId == null">
+                and a.organization_name IS NOT NULL
+            </if>
+        </if>
+        <if test="organizationName != null  and organizationName != ''">
+            and a.organization_name like concat('%' , #{organizationName} , '%')
         </if>
         <if test="organizationIds !=null">
             and a.organization_id in