From 3a7ca46cd9bf3fc2f4bf245d1896a17831a27fd8 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 20 Jun 2022 17:30:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86-=E5=A1=AB=E5=86=99=E4=BA=BA=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOController.java    | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
index 38331b390..9b28764d5 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
@@ -1,16 +1,24 @@
 package com.jero.modules.cert.collect.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.aspect.annotation.PermissionData;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
 import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
 import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -21,6 +29,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -37,6 +46,9 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	@Autowired
 	private IParamsCollectManifestEOService paramsCollectManifestEOService;
 
+	@Autowired
+	private ISysUserService sysUserService;
+
 	/**
 	 * 表头中英文切换
 	 *
@@ -265,6 +277,43 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 		}
 	}
 
+	/**
+	 * 获取用户列表数据
+	 *
+	 * @param user
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "填写人-分页查询")
+	@ApiOperation(value="填写人-分页查询", notes="填写人-分页查询")
+	@GetMapping(value = "/drePage")
+	public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+												@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+		Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
+		QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
+		//TODO 外部模拟登陆临时账号，列表不显示
+		queryWrapper.ne("username", "_reserve_user_external");
+		Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
+		IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
+
+		//批量查询用户的所属部门
+		//step.1 先拿到全部的 useids
+		//step.2 通过 useids，一次性查询用户的所属部门名字
+		List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
+		if (userIds != null && userIds.size() > 0) {
+			Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
+			pageList.getRecords().forEach(item -> {
+				item.setOrgCodeTxt(useDepNames.get(item.getId()));
+			});
+		}
+		result.setSuccess(true);
+		result.setResult(pageList);
+		log.info(pageList.toString());
+		return result;
+	}
+
 	/**
 	 *  分配工程接口人
 	 *