update 还原数据权限修改

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

@@ -40,9 +40,7 @@
             AND status = #{status}
         </if>
         <!-- 数据范围过滤 -->
-        <if test="params.dataScope != null and params.dataScope != ''">
-            AND ( ${params.dataScope} )
-        </if>
+        ${params.dataScope}
         order by d.parent_id, d.order_num
     </select>
 

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

@@ -58,9 +58,7 @@
             and date_format(r.create_time,'%y%m%d') <= date_format(#{role.params.endTime},'%y%m%d')
         </if>
         <!-- 数据范围过滤 -->
-        <if test="role.params.dataScope != null and role.params.dataScope != ''">
-            AND ( ${role.params.dataScope} )
-        </if>
+        ${role.params.dataScope}
         order by r.role_sort
     </select>
 
@@ -83,9 +81,7 @@
             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>
+        ${params.dataScope}
         order by r.role_sort
     </select>
 

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

@@ -106,9 +106,7 @@
             ancestors) ))
         </if>
         <!-- 数据范围过滤 -->
-        <if test="user.params.dataScope != null and user.params.dataScope != ''">
-            AND ( ${user.params.dataScope} )
-        </if>
+        ${user.params.dataScope}
     </select>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
@@ -137,9 +135,7 @@
             ancestors) ))
         </if>
         <!-- 数据范围过滤 -->
-        <if test="params.dataScope != null and params.dataScope != ''">
-            AND ( ${params.dataScope} )
-        </if>
+        ${params.dataScope}
     </select>
 
     <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">