Browse Source

查询所有人员添加状态筛选

zhaoxian 4 years ago
parent
commit
9a21bf1530

+ 5 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -126,9 +126,9 @@ public class SysUserController {
     }
 
     @RequestMapping(value = "/getAllUser", method = RequestMethod.GET)
-    public Result<Object> getAllUser() {
+    public Result<Object> getAllUser(String status) {
         try {
-            List<SysUserVo> allUser = sysUserService.getAllUser(null);
+            List<SysUserVo> allUser = sysUserService.getAllUser(null,status);
             return Result.ok(allUser);
         } catch (Exception e) {
             e.printStackTrace();
@@ -201,7 +201,7 @@ public class SysUserController {
             String companyId = userCompany.getCompanyId();
             List<SysUserVo> userList;
             if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
-                userList = sysUserService.getAllUser(userName);
+                userList = sysUserService.getAllUser(userName,null);
             } else {
                 userList = sysUserService.getUserListByCompany(companyId, userName);
             }
@@ -234,7 +234,7 @@ public class SysUserController {
 
             PageHelper.startPage(pageNo, pageSize);
             if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
-                userList = sysUserService.getAllUser(userName);
+                userList = sysUserService.getAllUser(userName,null);
             } else {
                 userList = sysUserService.getUserListByCompany(companyId, userName);
             }
@@ -263,7 +263,7 @@ public class SysUserController {
             String companyId = userCompany.getCompanyId();
             List<SysUserVo> userList;
             if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
-                userList = sysUserService.getAllUser(userName);
+                userList = sysUserService.getAllUser(userName,null);
             } else {
                 userList = sysUserService.getUserListByCompany(companyId, userName);
             }

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/mapper/SysUserMapper.java

@@ -161,7 +161,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     Map<String, Object> queryRoleCode(@Param("userId") String userId);
 
-    List<SysUserVo> getAllUser(@Param("userName") String userName);
+    List<SysUserVo> getAllUser(@Param("userName") String userName,@Param("status") String status);
 
     List<SysUserVo> getUserListByCompany(@Param("companyId") String companyId, @Param("userName") String userName);
 

+ 3 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SysUserMapper.xml

@@ -100,6 +100,9 @@ SELECT
         <if test="userName != null and userName != ''">
             and t1.realname like concat(concat('%',#{userName}),'%')
         </if>
+          <if test="status != null and status != ''">
+            and t1.status =#{status}
+        </if>
     </select>
     <!-- SQL片段:getUserByOrgCode 的 FROM 和 WHERE 部分 -->
     <sql id="getUserByOrgCodeFromSql">

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/ISysUserService.java

@@ -259,7 +259,7 @@ public interface ISysUserService extends IService<SysUser> {
      */
     List<SysUser> queryByDepIds(List<String> departIds, String username);
 
-    List<SysUserVo> getAllUser(String userName);
+    List<SysUserVo> getAllUser(String userName,String status);
 
     List<SysUser> getAllDesigner();
 

+ 2 - 2
module-common/src/main/java/cn/com/ctop/common/module/service/impl/SysUserServiceImpl.java

@@ -268,8 +268,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public List<SysUserVo> getAllUser(String userName) {
-        return userMapper.getAllUser(userName);
+    public List<SysUserVo> getAllUser(String userName,String status) {
+        return userMapper.getAllUser(userName,status);
     }
 
     @Override