Merge branch 'feat-userselect-20220608' of googol/YY_BE_2 into master

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/UserDTO.java

@@ -62,4 +62,14 @@ public class UserDTO extends SysUser {
 
 	private String subType;
 
+	/**
+	 * 认证状态
+	 */
+	private String certType;
+
+	/**
+	 * 用户id集合
+	 */
+	private List<Integer> userIdList;
+
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -1432,7 +1432,8 @@ public class SysUserController {
 	 */
 	@GetMapping("/selectUserList")
 	public R selectUserList(Page page, UserDTO userDTO) {
-		if (!"0".equals(userDTO.getSubType()) && !"1".equals(userDTO.getSubType())) {
+		if (!"0".equals(userDTO.getSubType()) && !"1".equals(userDTO.getSubType())
+				&& !"2".equals(userDTO.getSubType()) && !"3".equals(userDTO.getSubType())) {
 			userDTO.setSubType(null);
 		}
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysUserServiceImpl.java

@@ -19,6 +19,7 @@
 
 package com.qunzhixinxi.hnqz.admin.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.lang.Validator;
@@ -969,6 +970,23 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	@Override
 	public IPage selectUserList(Page page, UserDTO userDTO) {
+
+		// 认证状态查询条件
+//		if (StrUtil.isNotBlank(userDTO.getSubType()) && userDTO.getCertStatus() != null) {
+		if (StrUtil.isNotBlank(userDTO.getSubType()) && userDTO.getCertType() != null) {
+			List<SysUserSub> userSubList = sysUserSubMapper.selectList(Wrappers.<SysUserSub>lambdaQuery()
+					.eq(SysUserSub::getGigType, GigTypeEnum.resolve(Integer.parseInt(userDTO.getSubType())))
+					.eq(SysUserSub::getCertStatus, userDTO.getCertType()));
+			if (CollUtil.isNotEmpty(userSubList)) {
+				Set<Integer> certUserIdSet = userSubList.stream().map(SysUserSub::getUserId).collect(Collectors.toSet());
+				userDTO.setUserIdList(CollUtil.newArrayList(certUserIdSet));
+			} else {
+				userDTO.setUserIdList(CollUtil.newArrayList(-1));
+			}
+			userDTO.setCertStatus(null);
+			userDTO.setRljCertStatus(null);
+		}
+
 		if (SecurityUtils.getRoles().contains(1) || SecurityUtils.getRoles().contains(2)) {
 			return baseMapper.getUserVosPage(page, userDTO, new DataScope());
 		} else if (SecurityUtils.getRoles().contains(19)) {

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -314,6 +314,13 @@
 			</foreach>
 			)
 		</if>
+		<if test="query.userIdList != null and query.userIdList.size() > 0">
+			AND u.user_id in (
+			<foreach collection="query.userIdList" item="userId" index="index" separator=",">
+				#{userId}
+			</foreach>
+			)
+		</if>
 	</select>
 
 	<select id="selectByPhone" resultMap="userVoResultMap">
@@ -509,6 +516,13 @@
 			<if test="query.lockFlag != null and query.lockFlag != ''">
 				AND u.lock_flag =#{query.lockFlag}
 			</if>
+			<if test="query.userIdList != null and query.userIdList.size() > 0">
+				AND u.user_id in (
+				<foreach collection="query.userIdList" item="userId" index="index" separator=",">
+					#{userId}
+				</foreach>
+				)
+			</if>
 			AND <![CDATA[ u.username<>'admin']]>
 		</where>
 		ORDER BY u.create_time DESC