Explorar el Código

修改根据账号名称查询账号信息接口

xingguoqiang hace 3 años
padre
commit
5a8e71301e

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

@@ -26,6 +26,10 @@ public class SaasAccountQueryByNameVO {
     @ApiModelProperty(value = "账号所属, 0-运维系统账号,1-业务账号", example = "0")
     private String accountBelong;	//账号所属, 0-运维系统账号,1-业务账号
 
+    @NotBlank(message = "账号类型,不可为空")
+    @ApiModelProperty(value = "账号类型,0-超级管理员,1-集团管理员,2-普通账号,默认2")
+    private String accountType;
+    
 	@NotBlank(message = "集团编码,不可为空")
 	@ApiModelProperty(value = "集团编码,作为SQL条件", example = "RC")
 	private String groupCode; 	// 所属集团编码

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

@@ -122,7 +122,7 @@ public class SaasAccountServiceImpl extends SuperServiceImpl<SaasAccountMapper,
     @Override
     public LambdaQueryWrapper<SaasAccount> getQueryWrapperByUsername(SaasAccount saasAccount) {
         LambdaQueryWrapper<SaasAccount> queryWrapper = new SaasAccount.Builder().createQueryWrapper().accountBelongEq(saasAccount.getAccountBelong())
-                .groupCodeEq(saasAccount.getGroupCode()).usernameEq(saasAccount.getUsername()).builderQueryWrapper();
+                .accountTypeEq(saasAccount.getAccountType()).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,