更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/OrganizationUserController.java

@@ -7,11 +7,11 @@ import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.base.ProjectOidParam;
 import com.zhongshu.card.client.model.org.OrgUserDetailParam;
+import com.zhongshu.card.client.model.org.UserCountAddParam;
+import com.zhongshu.card.client.model.org.orgUser.OrganizationUserAuditParam;
 import com.zhongshu.card.client.model.org.orgUser.OrganizationUserModel;
 import com.zhongshu.card.client.model.org.orgUser.OrganizationUserSearch;
-import com.zhongshu.card.client.model.org.UserCountAddParam;
 import com.zhongshu.card.client.model.org.register.UserCountRegisterParam;
-import com.zhongshu.card.client.model.org.orgUser.OrganizationUserAuditParam;
 import com.zhongshu.card.client.model.orgModel.OrgBindUserAllParam;
 import com.zhongshu.card.client.model.school.ImportResultModel;
 import com.zhongshu.card.client.service.org.UserAccountService;
@@ -190,7 +190,7 @@ public class OrganizationUserController {
     }
 
     @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "审核注册用户", description = "审核注册用户")
+    @Operation(summary = "审核项目注册用户", description = "审核项目注册用户")
     @RequestMapping(value = {"auditOrgUser"}, method = {RequestMethod.POST})
     public ResultContent auditOrgUser(@RequestBody @Valid OrganizationUserAuditParam param) {
         return organizationUserService.auditOrgUser(param);

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/dictionary/DictionaryService.java

@@ -22,10 +22,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -241,6 +238,17 @@ public class DictionaryService extends SuperService {
         });
 
         List<DictionaryItemModel> dItemChildrenResults = dictionaryItemDao.deepAggregate(param.getDictionaryId(), pageModel.getContent().stream().map(DictionaryItemModel::getKey).toList());
+        if (ObjectUtils.isNotEmpty(dItemChildrenResults)) {
+            Collections.sort(dItemChildrenResults, new Comparator<DictionaryItemModel>() {
+                @Override
+                public int compare(DictionaryItemModel o1, DictionaryItemModel o2) {
+                    if (o1.getSort() == null || o2.getSort() == null) {
+                        return 0;
+                    }
+                    return o1.getSort() - o2.getSort();
+                }
+            });
+        }
         List<DictionaryItemModel> ret = new ArrayList<>();
         dItemChildrenResults.forEach(it -> {
             if (it.getChildren() != null && it.getChildren().size() > 0) {

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationServiceImpl.java

@@ -234,6 +234,7 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
     public ResultContent<Page<ProjectOrgModel>> pageProject(OrganizationSearchParam param, Pageable pageable) {
         initSearchParam(param);
         String userId = getCurrentUserId();
+        // 判断是否是超级管理员
         Boolean isSuperAdmin = roleServiceImpl.isSuperAdmin(userId);
         if (isSuperAdmin == null || !isSuperAdmin) {
             // 不是平台管理员，只能查看自己为项目负责人的数据