联合商户账号分组组件

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/AccountGroupController.java

@@ -99,10 +99,10 @@ public class AccountGroupController {
         List<UnionEnterpriseAccountGroupListVO> voList = new ArrayList<>();
 
         UnionEnterpriseAccountGroupListVO ownVO = new UnionEnterpriseAccountGroupListVO();
-        ownVO.setValue(ownEnterpriseId != null ? ownEnterpriseId.toString() : null);
+        ownVO.setAccountGroupId(ownEnterpriseId);
         ServiceResponse<EnterpriseDTO> ownEnterpriseResponse = enterpriseApiService.getEnterpriseById(ownEnterpriseId);
         if (ownEnterpriseResponse.isSuccess()) {
-            ownVO.setLabel(ownEnterpriseResponse.getResult().getEnterpriseName());
+            ownVO.setAccountGroupName(ownEnterpriseResponse.getResult().getEnterpriseName());
         }
         ServiceResponse<List<AccountGroupDTO>> ownResponse = accountGroupApiService.listNoMemberByEnterpriseId(ownEnterpriseId);
         if (ownResponse.isSuccess()) {
@@ -112,8 +112,8 @@ public class AccountGroupController {
                 .listNoMemberByEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
 
         UnionEnterpriseAccountGroupListVO currentVO = new UnionEnterpriseAccountGroupListVO();
-        currentVO.setLabel(UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
-        currentVO.setValue(UserDetailUtils.getUserDetail().getEnterpriseId().toString());
+        currentVO.setAccountGroupName(UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
+        currentVO.setAccountGroupId(UserDetailUtils.getUserDetail().getEnterpriseId());
         if (currentResponse.isSuccess()) {
             currentVO.setChildren(EntityUtil.changeEntityListNew(AccountGroupListVO.class, currentResponse.getResult()));
         }

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/UnionEnterpriseAccountGroupListVO.java

@@ -16,30 +16,30 @@ public class UnionEnterpriseAccountGroupListVO implements Serializable{
     /**
      * 商户ID
      */
-    private String value;
+    private Integer accountGroupId;
 
     /**
      * 商户名称
      */
-    private String label;
+    private String accountGroupName;
 
     private List<AccountGroupListVO> children;
 
-    public String getValue() {
-        return value;
+    public Integer getAccountGroupId() {
+        return accountGroupId;
     }
 
-    public UnionEnterpriseAccountGroupListVO setValue(String value) {
-        this.value = value;
+    public UnionEnterpriseAccountGroupListVO setAccountGroupId(Integer accountGroupId) {
+        this.accountGroupId = accountGroupId;
         return this;
     }
 
-    public String getLabel() {
-        return label;
+    public String getAccountGroupName() {
+        return accountGroupName;
     }
 
-    public UnionEnterpriseAccountGroupListVO setLabel(String label) {
-        this.label = label;
+    public UnionEnterpriseAccountGroupListVO setAccountGroupName(String accountGroupName) {
+        this.accountGroupName = accountGroupName;
         return this;
     }
 
@@ -55,8 +55,8 @@ public class UnionEnterpriseAccountGroupListVO implements Serializable{
     @Override
     public String toString() {
         return "UnionEnterpriseAccountGroupListVO{" +
-                "value='" + value + '\'' +
-                ", label='" + label + '\'' +
+                "accountGroupId=" + accountGroupId +
+                ", accountGroupName='" + accountGroupName + '\'' +
                 ", children=" + children +
                 '}';
     }