修复账号中心后台管理BUG

sso-manage-console-web/src/components/accounts/appeals/AppealHome.vue

@@ -21,7 +21,7 @@
       </el-select>
 
       <!-- 申诉来源 -->
-      <label>申诉来源</label>
+      <!--<label>申诉来源</label>
       <el-select v-model="pageParams.fromApp" clearable placeholder="不限" @change="handleRefreshData">
         <el-option
           v-for="item in fromAppOptions"
@@ -29,7 +29,7 @@
           :label="item.label"
           :value="item.value">
         </el-option>
-      </el-select>
+      </el-select>-->
 
       <!-- 申诉状态 -->
       <label>申诉状态</label>

sso-manage-console-web/src/components/accounts/enterprises/EnterpriseBasicInfo.vue

@@ -32,7 +32,7 @@
         </el-input>
       </el-form-item>
       <el-form-item label="企业地址">
-        <el-input v-model="enterpriseInfo.companyAddress" :readonly="true">
+        <el-input v-model="enterpriseInfo.companyAddress" :readonly="false">
           <i class="el-input__icon" slot="prefix" style="line-height: 16px;margin-left: 10px;">
             <img src="/static/images/loc.png" alt="Location">
           </i>
@@ -41,7 +41,7 @@
       <el-form-item label="认证状态" width="400">
         <el-select v-model="enterpriseInfo.validCode" placeholder="请选择认证状态">
           <el-option label="未认证" :value="0"></el-option>
-          <el-option label="申诉中" :value="1"></el-option>
+          <el-option label="认证中" :value="1"></el-option>
           <el-option label="已认证" :value="2"></el-option>
           <el-option label="未通过" :value="3"></el-option>
         </el-select>

sso-manage-console-web/src/components/accounts/enterprises/EnterpriseHome.vue

@@ -21,7 +21,7 @@
       </el-select>
 
       <!-- 注册来源 -->
-      <label>注册来源</label>
+      <!--<label>注册来源</label>
       <el-select v-model="pageParams.fromApp" clearable placeholder="不限" @change="handleRefreshData">
         <el-option
           v-for="item in fromAppOptions"
@@ -29,7 +29,7 @@
           :label="item.label"
           :value="item.value">
         </el-option>
-      </el-select>
+      </el-select>-->
     </div>
 
     <el-table

sso-manage-console-web/src/components/accounts/enterprises/EnterpriseMembers.vue

@@ -55,7 +55,7 @@
             type="button"
             class="btn btn-default btn-refresh btn-bind"
             @click="showBindDialog">
-            绑定用户
+            添加成员
           </button>
 
           <div class="pagination-area">
@@ -73,9 +73,9 @@
       </el-footer>
     </el-container>
 
-    <!-- 绑定用户对话框 -->
+    <!-- 添加成员对话框 -->
     <el-dialog
-      title="绑定用户"
+      title="添加成员"
       :visible.sync="isBindUser"
       width="450px"
       :show-close="true"

sso-manage-console/src/main/java/com/uas/sso/sso/backend/service/impl/AppealServiceImpl.java

@@ -1,5 +1,6 @@
 package com.uas.sso.sso.backend.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.uas.sso.dao.AppealDao;
 import com.uas.sso.dao.UserDao;
 import com.uas.sso.dao.UserspaceDao;
@@ -163,12 +164,21 @@ public class AppealServiceImpl implements AppealService {
             Userspace space = assertSpaceExist(spaceUU);
             User user = userDao.findByMobile(appeal.getMobile());
             if (user == null) {
-                AddNewUserInfo newUserInfo = new AddNewUserInfo();
-                newUserInfo.setVipName(appeal.getContactName());
-                newUserInfo.setEmail(appeal.getContactEmail());
-                newUserInfo.setMobile(appeal.getContactTel());
-                newUserInfo.setPassword("123456");
-                user = userService.addNewUser(newUserInfo);
+                JSONObject jsonObject = JacksonUtils.fromJson(appeal.getSubmitInfo(), JSONObject.class);
+                Assert.notNull(jsonObject, "必需更新的新管理员信息");
+
+                User adminUser = JacksonUtils.fromJson(jsonObject.getString("admin"), User.class);
+                Assert.notNull(adminUser, "更新的新管理员信息无效");
+
+                user = userDao.findByMobile(adminUser.getMobile());
+                if (user == null) {
+                    AddNewUserInfo newUserInfo = new AddNewUserInfo();
+                    newUserInfo.setVipName(adminUser.getVipName());
+                    newUserInfo.setEmail(adminUser.getEmail());
+                    newUserInfo.setMobile(adminUser.getMobile());
+                    newUserInfo.setPassword("123456");
+                    user = userService.addNewUser(newUserInfo);
+                }
             }
 
             // 记录管理员更换记录