saas-account/src/main/java/com/persagy/person/pojo/vo/account/SaasAccountQueryByNameVO.java

@@ -22,11 +22,9 @@ import javax.validation.constraints.NotBlank;
 @ToString
 public class SaasAccountQueryByNameVO {
 
-    @NotBlank(message = "账号所属，不可为空")
     @ApiModelProperty(value = "账号所属, 0-运维系统账号，1-业务账号", example = "0")
     private String accountBelong;	//账号所属, 0-运维系统账号，1-业务账号
 
-    @NotBlank(message = "账号类型，不可为空")
     @ApiModelProperty(value = "账号类型，0-超级管理员，1-集团管理员，2-普通账号，默认2")
     private String accountType;
     

saas-account/src/main/java/com/persagy/person/service/impl/SaasAccountServiceImpl.java

@@ -121,8 +121,8 @@ public class SaasAccountServiceImpl extends SuperServiceImpl<SaasAccountMapper,
 
     @Override
     public LambdaQueryWrapper<SaasAccount> getQueryWrapperByUsername(SaasAccount saasAccount) {
-        LambdaQueryWrapper<SaasAccount> queryWrapper = new SaasAccount.Builder().createQueryWrapper().accountBelongEq(saasAccount.getAccountBelong())
-                .accountTypeEq(saasAccount.getAccountType()).groupCodeEq(saasAccount.getGroupCode()).usernameEq(saasAccount.getUsername()).builderQueryWrapper();
+        LambdaQueryWrapper<SaasAccount> queryWrapper = new SaasAccount.Builder().createQueryWrapper()
+                .groupCodeEq(saasAccount.getGroupCode()).usernameEq(saasAccount.getUsername()).builderQueryWrapper();
         queryWrapper.select(SaasAccount::getId, SaasAccount::getGroupCode, SaasAccount::getAppId, SaasAccount::getUsername,
                 SaasAccount::getPhoneNum, SaasAccount::getMail, SaasAccount::getHeadPortrait, SaasAccount::getAccountBelong,
                 SaasAccount::getAccountSource, SaasAccount::getAccountType, SaasAccount::getLastLoginIp, SaasAccount::getLastLoginTime,