|
@@ -41,6 +41,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysUserRole;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
|
|
|
import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.SysDeptSub;
|
|
|
+import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.dto.CommonUserDTO;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.input.UserCertificationInput;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.model.excel.CommonUserExcelModel;
|
|
@@ -49,6 +50,7 @@ import com.qunzhixinxi.hnqz.admin.mapper.*;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.SysDeptSubService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.SysUserService;
|
|
|
+import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmDaAgentService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
|
|
|
import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
|
|
@@ -97,6 +99,7 @@ public class SysUserController {
|
|
|
private final RedisTemplate redisTemplate;
|
|
|
private final SysUserRoleMapper sysUserRoleMapper;
|
|
|
private final QccService qccService;
|
|
|
+ private final SysUserSubService sysUserSubService;
|
|
|
|
|
|
|
|
|
private boolean isZbOrDbUsers(Integer[] roles) {
|
|
@@ -1455,6 +1458,13 @@ public class SysUserController {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
+ // 封装用户签约认证主体信息
|
|
|
+ userVosPage.getRecords().forEach(userVO -> {
|
|
|
+ List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
|
|
|
+ .eq(SysUserSub::getUserId, userVO.getUserId()));
|
|
|
+ userVO.setUserSubList(BeanUtil.copyToList(userSubList, Map.class));
|
|
|
+ });
|
|
|
+
|
|
|
return R.ok(userVosPage);
|
|
|
}
|
|
|
|