From e0060e956b8857d3f7ad92835eb413edb32347f3 Mon Sep 17 00:00:00 2001
From: yitonglei <ytl653@163.com>
Date: Tue, 14 Feb 2023 13:51:24 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA/blade-us?=
 =?UTF-8?q?er/search/userToProcess?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/controller/UserController.java       | 17 +++++++
 .../system/user/service/IUserService.java     |  2 +
 .../user/service/impl/UserServiceImpl.java    | 48 +++++++++++++++++++
 3 files changed, 67 insertions(+)

diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java
index 71ce12d..2d55d89 100644
--- a/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java
+++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java
@@ -364,6 +364,23 @@ public class UserController {
 		return R.data(userService.selectUserSearch(user, query));
 	}
 
+	/**
+	 * 用户列表查询,工作流指定审批人专用
+	 */
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "name", value = "人员姓名", paramType = "query", dataType = "string"),
+			@ApiImplicitParam(name = "deptName", value = "部门名称", paramType = "query", dataType = "string"),
+			@ApiImplicitParam(name = "postName", value = "职位名称", paramType = "query", dataType = "string"),
+			@ApiImplicitParam(name = "current", value = "当前页数", paramType = "query", dataType = "int"),
+			@ApiImplicitParam(name = "size", value = "每页数量", paramType = "query", dataType = "int")
+	})
+	@ApiOperationSupport(order = 50)
+	@ApiOperation(value = "用户列表查询", notes = "用户列表查询")
+	@GetMapping("/search/userToProcess")
+	public R<IPage<UserVO>> userSearchToProcess(@ApiIgnore UserVO user, @ApiIgnore Query query) {
+		return R.data(userService.selectUserSearchToProcess(user, query));
+	}
+
 
 	/**
 	 * 通过当前用户获取所属部门所有成员
diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/service/IUserService.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/service/IUserService.java
index 77e6b5b..ab86d66 100644
--- a/lab-service/lab-user/src/main/java/org/springblade/system/user/service/IUserService.java
+++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/service/IUserService.java
@@ -68,6 +68,8 @@ public interface IUserService extends BaseService<User> {
 	 */
 	IPage<UserVO> selectUserSearch(UserVO user, Query query);
 
+	IPage<UserVO> selectUserSearchToProcess(UserVO user, Query query);
+
 
 	/**
 	 * 用户信息
diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 4a783e9..580fb2c 100644
--- a/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -13,6 +13,7 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.BladeTenantProperties;
 import org.springblade.core.tool.api.R;
@@ -253,6 +254,53 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
         return UserWrapper.build().pageVO(pages);
     }
 
+    @Override
+    public IPage<UserVO> selectUserSearchToProcess(UserVO user, Query query) {
+        BladeUser bladeUser = AuthUtil.getUser();
+        String deptIdS = bladeUser.getDeptId();
+
+
+        LambdaQueryWrapper<User> queryWrapper = Wrappers.<User>query().lambda();
+        if (StringUtil.isNotBlank(user.getName())) {
+            queryWrapper.like(User::getName, user.getName());
+        }
+
+        if (StringUtil.isNotBlank(deptIdS)) {
+            queryWrapper.and(wrapper -> {
+                List<String> ids = Func.toStrList(deptIdS);
+                ids.forEach(id -> wrapper.like(User::getDeptId, id).or());
+            });
+        }
+
+
+
+//        if (StringUtil.isNotBlank(user.getDeptName())) {
+//            String deptIds = SysCache.getDeptIdsByFuzzy(AuthUtil.getTenantId(), user.getDeptName());
+//            if (StringUtil.isNotBlank(deptIds)) {
+//                queryWrapper.and(wrapper -> {
+//                    List<String> ids = Func.toStrList(deptIds);
+//                    ids.forEach(id -> wrapper.like(User::getDeptId, id).or());
+//                });
+//            }
+//        }
+//        if (StringUtil.isNotBlank(user.getPostName())) {
+//            String postIds = SysCache.getPostIdsByFuzzy(AuthUtil.getTenantId(), user.getPostName());
+//            if (StringUtil.isNotBlank(postIds)) {
+//                queryWrapper.and(wrapper -> {
+//                    List<String> ids = Func.toStrList(postIds);
+//                    ids.forEach(id -> wrapper.like(User::getPostId, id));
+//                });
+//            }
+//        }
+//        if (user.getShowCap() != null && user.getShowCap() == 0) {
+//            queryWrapper.like(User::getRoleId, "1432876315142520834");
+//        }
+
+        IPage<Object> page = Condition.getPage(query);
+        IPage<User> pages = this.page(Condition.getPage(query), queryWrapper);
+        return UserWrapper.build().pageVO(pages);
+    }
+
     @Override
     public User userByAccount(String tenantId, String account) {
         return baseMapper.selectOne(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, account).eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED));