11482-【CR】【投资系统】增加审批流程-查询用户和部门去掉角色控制部门设置

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

@@ -245,6 +245,7 @@ public class SysUserController extends BaseController
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysDept dept)
     {
+        dept.setStatus("0");
         return success(deptService.selectDeptTreeList(dept));
     }
 
@@ -257,6 +258,8 @@ public class SysUserController extends BaseController
     public TableDataInfo listUser(SysUser user)
     {
         startPage();
+        user.setDelFlag("0");
+        user.setStatus("0");
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
     }

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

@@ -57,7 +57,8 @@ public class SysDeptServiceImpl implements ISysDeptService
     @Override
     public List<TreeSelect> selectDeptTreeList(SysDept dept)
     {
-        List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
+        //List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
+        List<SysDept> depts = deptMapper.selectDeptList(dept);
         return buildDeptTreeSelect(depts);
     }
 

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

@@ -71,7 +71,6 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户信息集合信息
      */
     @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectUserList(SysUser user)
     {
         return userMapper.selectUserList(user);