浏览代码

feat: 用户列表查询渠道

lixuesong 3 年之前
父节点
当前提交
34e32342f8

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

@@ -1463,15 +1463,16 @@ public class SysUserController {
 			});
 		}
 
-		// 封装用户签约认证主体信息
-		SysDeptSub sysDeptSub = new SysDeptSub();
-		sysDeptSub.setDeptId(SecurityUtils.getUser().getDeptId());
-		sysDeptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
-		List<SysDeptSub> subList = sysDeptSubService.list(Wrappers.query(sysDeptSub));
-
 		userVosPage.getRecords().forEach(userVO -> {
+			// 查询所属企业渠道
+			SysDeptSub sysDeptSub = new SysDeptSub();
+			sysDeptSub.setDeptId(userVO.getDeptId());
+			sysDeptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
+			List<SysDeptSub> subList = sysDeptSubService.list(Wrappers.query(sysDeptSub));
+			// 查询当前用户认证渠道
 			List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, userVO.getUserId()));
+
 			if (CollUtil.isNotEmpty(userSubList) && CollUtil.isNotEmpty(subList)) {
 				Map<GigTypeEnum, String> certStatusMap = userSubList.stream()
 						.collect(Collectors.toMap(SysUserSub::getGigType,