fixbug

saas-module/src/main/java/com/makeit/controller/saas/SaasPlatUserController.java

@@ -51,9 +51,10 @@ public class SaasPlatUserController {
     }
 
     @Action(module = "saas端-租户账号", name = "列表", code = "saas.plat.user.listTenant")
-    @ApiOperation("列表")
+    @ApiOperation("列表-未关联租户")
     @PostMapping("listTenant")
     public ApiResponseEntity<List<PlatUserDTOVO>> listTenant(@RequestBody PlatUserQueryDTO dto){
+        dto.setLinkTenant(CommonEnum.NO.getValue());
         return ApiResponseUtils.success(platUserService.listTenant(dto));
     }
 

server-common/src/main/java/com/makeit/module/admin/dto/plat/PlatUserQueryDTO.java

@@ -32,21 +32,6 @@ public class PlatUserQueryDTO extends BaseOrgDTO {
     @ApiModelProperty(value = "要排除的角色id roleId和notRoleId只能用一个")
     private String notRoleId;
 
-//    @ApiModelProperty(value = "关键词 用来搜姓名或者工号")
-//    private String keyword;
-//
-//    @ApiModelProperty(value = "职级")
-//    private Integer postLevel;
-//
-//    @ApiModelProperty(value = "是否从酒店开始 0否 1是")
-//    private String fromHotel;
-//
-//    @ApiModelProperty(value = "是否常用人员 0否 1是")
-//    private String isFrequent;
-//
-//    @ApiModelProperty(value = "标签id")
-//    private String labelId;
-
     @ApiModelProperty(value = "用户工号集合")
     private List<String> accountList;
 
@@ -62,4 +47,7 @@ public class PlatUserQueryDTO extends BaseOrgDTO {
     @ApiModelProperty(value = "部门id集合")
     private List<String> orgIdList;
 
+    @ApiModelProperty(value = "已关联租户 0-未关联 1-已关联")
+    private String linkTenant;
+
 }

server-common/src/main/java/com/makeit/module/admin/vo/plat/PlatTenantVO.java

@@ -28,7 +28,7 @@ public class PlatTenantVO extends BaseIdDTO implements Serializable {
     private LocalDate endTime;
 
     @ApiModelProperty(value = "租户管理员id")
-    private String tntUserId;
+    private String platUserId;
 
     @ApiModelProperty(value = "租户管理员账号")
     private String userAccount;

server-service/src/main/java/com/makeit/service/saas/impl/PlatTenantServiceImpl.java

@@ -132,11 +132,12 @@ implements PlatTenantService {
         List<PlatTenantVO> voList = BeanDtoVoUtils.listVo(pageList.getRecords(), PlatTenantVO.class);
 
         TntUserJoinUtil.join(platUserService,voList,qw->qw.eq(PlatUser::getIsTenant, IsTenantAccountEnum.YES.getValue()),
-                PlatTenantVO::getTntUserId,(t, u) -> {
-                    t.setUserAccount(u.getMobile());
+                PlatTenantVO::getPlatUserId,(t, u) -> {
+                    t.setUserAccount(u.getAccount());
                     t.setUserName(u.getUsername());
                 }, BaseEntity::getId);
 
+
         return PageUtil.toPageVO(voList, pageList);
     }