Merge remote-tracking branch 'origin/dev' into dev2

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

@@ -70,7 +70,7 @@
         label="申诉人"
         width="100">
         <template slot-scope="scope">
-          <span v-if="scope.row.submitterUU > 0" v-text="scope.row.contactName"></span>
+          <span v-if="scope.row.submitterUU > 0" v-text="scope.row.appealName"></span>
           <span v-else>游客</span>
         </template>
       </el-table-column>
@@ -143,7 +143,7 @@
         <div class="row">
           <div class="col-lg-6">
             <div class="message-label">申诉人</div>
-            <div class="message-value message-value-highlight" v-text="selectedAppeal.contactName"></div>
+            <div class="message-value message-value-highlight" v-text="selectedAppeal.appealName"></div>
           </div>
           <div class="col-lg-6">
             <div class="message-label">联系人</div>
@@ -414,7 +414,7 @@
 
   const statusOptions = [
     {
-      label: '已认证',
+      label: '已通过',
       key: 'AUTHENTICATED',
       value: 2
     }, {

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

@@ -26,8 +26,10 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Order;
@@ -88,10 +90,10 @@ public class AppealServiceImpl implements AppealService {
     public Page<Appeal> showAppealsByPagination(Pageable page, String type, String fromApp,
             Short status, String key, String keyword) {
 
-        return appealDao.findAll(new Specification<Appeal>() {
+        Page<Appeal> appealPage = appealDao.findAll(new Specification<Appeal>() {
             @Override
             public Predicate toPredicate(Root<Appeal> root, CriteriaQuery<?> query,
-                    CriteriaBuilder builder) {
+                                         CriteriaBuilder builder) {
                 List<Predicate> predicates = new ArrayList<>();
                 // 申诉类型
                 if (!StringUtils.isEmpty(type)) {
@@ -130,6 +132,17 @@ public class AppealServiceImpl implements AppealService {
                 return null;
             }
         }, page);
+
+        if (appealPage.hasContent()) {
+            for (Appeal appeal : appealPage.getContent()) {
+                User appealUser = userDao.findByUserUU(appeal.getSubmitterUU());
+                if (appealUser != null) {
+                    appeal.setAppealName(appealUser.getVipName());
+                }
+            }
+        }
+
+        return appealPage;
     }
 
     @Override
@@ -227,8 +240,13 @@ public class AppealServiceImpl implements AppealService {
             record.setChangeType(AdminChangeType.USER_APPEAL);
             recordDao.save(record);
 
+            // Set new admin to space info and add new admin to users of this space.
             space.setAdmin(user);
             space.setAdminUU(user.getUserUU());
+            Set<User> userSet = new HashSet<>(space.getUsers());
+            userSet.add(user);
+            space.setUsers(new ArrayList<>(userSet));
+
             // 更新企业信息
             space.setSpaceName(userSpace.getSpaceName());
             space.setCorporation(userSpace.getCorporation());

sso-server/src/main/java/com/uas/sso/entity/Appeal.java

@@ -57,6 +57,9 @@ public class Appeal implements Serializable {
     @Column(name = "submitter_uu")
     private Long submitterUU;
 
+    @Transient
+    private String appealName;
+
     /**
      * 申请人uu号
      */
@@ -218,6 +221,14 @@ public class Appeal implements Serializable {
         this.status = status;
     }
 
+    public String getAppealName() {
+        return appealName;
+    }
+
+    public void setAppealName(String appealName) {
+        this.appealName = appealName;
+    }
+
     /**
      * 申述类型枚举
      */