用户、部门

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -61,7 +61,7 @@ public class SysUserController extends BaseController
     /**
      * 获取用户列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+//    @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user)
     {

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -119,6 +119,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
             .antMatchers("/zhdd/**").permitAll()
             .antMatchers("/system/dict/**").permitAll()
             .antMatchers("/common/upload").permitAll()
+
+            // 系统层面
+            .antMatchers("/system/dept/treeselect",
+                "/system/user/list"
+            ).permitAll()
             // 除上面外的所有请求全部需要鉴权认证
             .anyRequest().authenticated()
             .and()

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -49,7 +49,7 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
      * @return 部门信息集合
      */
     @Override
-    @DataScope(deptAlias = "d")
+//    @DataScope(deptAlias = "d")
     public List<SysDept> selectDeptList(SysDept dept) {
         return baseMapper.selectDeptList(dept);
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -55,7 +55,7 @@ public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser,
     private ISysConfigService configService;
 
     @Override
-    @DataScope(deptAlias = "d", userAlias = "u", isUser = true)
+//    @DataScope(deptAlias = "d", userAlias = "u", isUser = true)
     public TableDataInfo<SysUser> selectPageUserList(SysUser user) {
         return PageUtils.buildDataInfo(baseMapper.selectPageUserList(PageUtils.buildPage(), user));
     }

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

@@ -94,6 +94,9 @@
         <if test="user.userName != null and user.userName != ''">
             AND u.user_name like concat('%', #{user.userName}, '%')
         </if>
+        <if test="user.nickName != null and user.nickName != ''">
+            AND u.nick_name like concat('%', #{user.nickName}, '%')
+        </if>
         <if test="user.status != null and user.status != ''">
             AND u.status = #{user.status}
         </if>