选怎人员以姓氏排序，议督评的发布所有人可见

src/main/java/com/ydool/boot/api/controller/ApiAppointController.java

@@ -55,10 +55,10 @@ public class ApiAppointController extends ApiBaseController {
     @GetMapping
     public void appointPage() {
         QueryWrapper<Appoint> qw = new QueryWrapper<Appoint>()
-                .and(_qw -> _qw
-                        .eq("created_id", getApiUserId())
-                        .or()
-                        .inSql("id", "select appoint_id from t_appoint_user where user_id='" + getApiUserId() + "'"))
+//                .and(_qw -> _qw
+//                        .eq("created_id", getApiUserId())
+//                        .or()
+//                        .inSql("id", "select appoint_id from t_appoint_user where user_id='" + getApiUserId() + "'"))
                 .orderByDesc("created_at");
         IPage<Appoint> paged = appointService.page(new Page<>(getPageNum(), getPageSize()), qw);
         render(Ret.ok().paged(AppointWrapper.build().pageVO(paged)));

src/main/java/com/ydool/boot/api/controller/ApiContactDbController.java

@@ -48,7 +48,9 @@ public class ApiContactDbController extends ApiBaseController {
     @ApiOperation("常委会联系代表列表 (被指定的人与创建人可见)")
     @GetMapping
     public void contactDbPage() {
-        QueryWrapper<ContactDb> qw = new QueryWrapper<ContactDb>().and(_qw -> _qw.eq("created_id", getApiUserId()).or().inSql("id", "select contact_db_id from t_contact_db_user where user_id='" + getApiUserId() + "'")).orderByDesc("created_at");
+        QueryWrapper<ContactDb> qw = new QueryWrapper<ContactDb>()
+//                .and(_qw -> _qw.eq("created_id", getApiUserId()).or().inSql("id", "select contact_db_id from t_contact_db_user where user_id='" + getApiUserId() + "'"))
+                .orderByDesc("created_at");
         IPage<ContactDb> paged = contactDbService.page(new Page<>(getPageNum(), getPageSize()), qw);
         render(Ret.ok().paged(ContactDbWrapper.build().pageVO(paged)));
     }

src/main/java/com/ydool/boot/api/controller/ApiReviewOfficerController.java

@@ -62,12 +62,12 @@ public class ApiReviewOfficerController extends ApiBaseController {
         QueryWrapper<ReviewOfficer> qw = new QueryWrapper<ReviewOfficer>()
                 .eq("type", type)
                 .like(StrUtil.isNotBlank(reviewSubject),"review_subject", reviewSubject)
-                .and(_qw -> _qw
-                        .eq("created_id", getApiUserId())
-                        .or()
-                        .inSql("id", "select review_id from t_review_officer_user where user_id='" + getApiUserId() + "'")
-                        .or()
-                        .inSql("id", "select review_id from t_review_officer_audit where user_id='" + getApiUserId() + "'"))
+//                .and(_qw -> _qw
+//                        .eq("created_id", getApiUserId())
+//                        .or()
+//                        .inSql("id", "select review_id from t_review_officer_user where user_id='" + getApiUserId() + "'")
+//                        .or()
+//                        .inSql("id", "select review_id from t_review_officer_audit where user_id='" + getApiUserId() + "'"))
                 .orderByDesc("created_at");
         IPage<ReviewOfficer> paged = reviewOfficerService.page(new Page<>(getPageNum(), getPageSize()), qw);
         render(Ret.ok().paged(ReviewOfficerWrapper.build().pageVO(paged)));

src/main/java/com/ydool/boot/api/controller/ApiReviewSubjectController.java

@@ -62,12 +62,12 @@ public class ApiReviewSubjectController extends ApiBaseController {
         QueryWrapper<ReviewSubject> qw = new QueryWrapper<ReviewSubject>()
                 .eq("type", type)
                 .like(StrUtil.isNotBlank(reviewSubject),"review_subject", reviewSubject)
-                .and(_qw -> _qw
-                        .eq("created_id", getApiUserId())
-                        .or()
-                        .inSql("id", "select review_id from t_review_subject_user where user_id='" + getApiUserId() + "'")
-                        .or()
-                        .inSql("id", "select review_id from t_review_subject_audit where user_id='" + getApiUserId() + "'"))
+//                .and(_qw -> _qw
+//                        .eq("created_id", getApiUserId())
+//                        .or()
+//                        .inSql("id", "select review_id from t_review_subject_user where user_id='" + getApiUserId() + "'")
+//                        .or()
+//                        .inSql("id", "select review_id from t_review_subject_audit where user_id='" + getApiUserId() + "'"))
                 .orderByDesc("created_at");
         IPage<ReviewSubject> paged = reviewSubjectService.page(new Page<>(getPageNum(), getPageSize()), qw);
         render(Ret.ok().paged(ReviewSubjectWrapper.build().pageVO(paged)));

src/main/java/com/ydool/boot/api/controller/ApiReviewSuperviseController.java

@@ -57,11 +57,11 @@ public class ApiReviewSuperviseController extends ApiBaseController {
     @GetMapping
     public void reviewSupervisePage(String subjectName,String type) {
         QueryWrapper<ReviewSupervise> qw = new QueryWrapper<ReviewSupervise>()
-                .and(_qw -> _qw
-                        .eq("created_id", getApiUserId())
-                        .or()
-                        .inSql("id", "select review_supervise_id from t_review_supervise_user where user_id='" + getApiUserId() + "'")
-                )
+//                .and(_qw -> _qw
+//                        .eq("created_id", getApiUserId())
+//                        .or()
+//                        .inSql("id", "select review_supervise_id from t_review_supervise_user where user_id='" + getApiUserId() + "'")
+//                )
                 .like(StrUtil.isNotBlank(subjectName),"subject_name",subjectName)
                 .like(StrUtil.isNotBlank(type),"type",type)
                 .orderByDesc("created_at");

src/main/java/com/ydool/boot/api/controller/ApiReviewWorkController.java

@@ -50,22 +50,20 @@ public class ApiReviewWorkController extends ApiBaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "page", value = "当前页"),
             @ApiImplicitParam(name = "size", value = "显示条数"),
-            @ApiImplicitParam(name = "type", value = "类型"),
     })
     @DynamicResponseParameters(properties = {
             @DynamicParameter(value = "评议", name = "data", dataTypeClass = ReviewWorkDto.class)
     })
     @ApiOperation("评议列表 (被指定的人与创建人可见)")
     @GetMapping
-    public void reviewPage(String type) {
+    public void reviewPage() {
         QueryWrapper<ReviewWork> qw = new QueryWrapper<ReviewWork>()
-//                .eq("type", type)
-                .and(_qw -> _qw
-                        .eq("created_id", getApiUserId())
-                        .or()
-                        .inSql("id", "select review_id from t_review_work_user where user_id='" + getApiUserId() + "'")
-                        .or()
-                        .inSql("id", "select review_id from t_review_work_audit where user_id='" + getApiUserId() + "'"))
+//                .and(_qw -> _qw
+//                        .eq("created_id", getApiUserId())
+//                        .or()
+//                        .inSql("id", "select review_id from t_review_work_user where user_id='" + getApiUserId() + "'")
+//                        .or()
+//                        .inSql("id", "select review_id from t_review_work_audit where user_id='" + getApiUserId() + "'"))
                 .orderByDesc("created_at");
         IPage<ReviewWork> paged = reviewWorkService.page(new Page<>(getPageNum(), getPageSize()), qw);
         render(Ret.ok().paged(ReviewWorkWrapper.build().pageVO(paged)));
@@ -74,16 +72,14 @@ public class ApiReviewWorkController extends ApiBaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "page", value = "当前页"),
             @ApiImplicitParam(name = "size", value = "显示条数"),
-            @ApiImplicitParam(name = "type", value = "类型"),
     })
     @DynamicResponseParameters(properties = {
             @DynamicParameter(value = "评议", name = "data", dataTypeClass = ReviewWorkDto.class)
     })
     @ApiOperation("公告栏 (所有人可见)")
     @GetMapping("public")
-    public void publicPage(String type) {
+    public void publicPage() {
         QueryWrapper<ReviewWork> qw = new QueryWrapper<ReviewWork>()
-//                .eq("type", type)
                 .ge("state", ReviewWork.STATE_PUBLIC)
                 .orderByDesc("created_at");
         IPage<ReviewWork> paged = reviewWorkService.page(new Page<>(getPageNum(), getPageSize()), qw);

src/main/java/com/ydool/boot/api/controller/ApiUserController.java

@@ -146,6 +146,7 @@ public class ApiUserController extends ApiBaseController {
             });
         }
         if (StringUtils.isNotBlank(userName)) wrapper.like("user_name", userName);
+        wrapper.orderByAsc("convert(user_name using GBK)");
         Page page = userService.page(new Page(getPageNum(), getPageSize()), wrapper);
         render(Ret.ok().paged(page));
     }

src/main/java/com/ydool/boot/modules/rddb/entity/AppointUser.java

@@ -96,5 +96,6 @@ public class AppointUser extends BaseEntity {
     @ApiModelProperty(value = "类型 (与任免督职环节相对应)")
     private Integer type;
 
-
+    @ApiModelProperty(value = "排序")
+    private Integer sortNo;
 }

src/main/java/com/ydool/boot/modules/rddb/entity/ContactDbUser.java

@@ -3,6 +3,7 @@ package com.ydool.boot.modules.rddb.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydool.boot.core.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -82,4 +83,7 @@ public class ContactDbUser extends BaseEntity{
     )
     private LocalDateTime signAt;
 
+    @ApiModelProperty(value = "排序")
+    private Integer sortNo;
+
 }

src/main/java/com/ydool/boot/modules/rddb/entity/ReviewOfficerUser.java

@@ -3,6 +3,7 @@ package com.ydool.boot.modules.rddb.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydool.boot.core.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -65,4 +66,7 @@ public class ReviewOfficerUser extends BaseEntity{
     )
     private LocalDateTime scoreAt;
 
+    @ApiModelProperty(value = "排序")
+    private Integer sortNo;
+
 }

src/main/java/com/ydool/boot/modules/rddb/entity/ReviewSubjectUser.java

@@ -3,6 +3,7 @@ package com.ydool.boot.modules.rddb.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydool.boot.core.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -65,4 +66,7 @@ public class ReviewSubjectUser extends BaseEntity{
     )
     private LocalDateTime scoreAt;
 
+    @ApiModelProperty(value = "排序")
+    private Integer sortNo;
+
 }

src/main/java/com/ydool/boot/modules/rddb/entity/ReviewSuperviseUser.java

@@ -3,6 +3,7 @@ package com.ydool.boot.modules.rddb.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydool.boot.core.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -67,4 +68,6 @@ public class ReviewSuperviseUser extends BaseEntity{
     )
     private LocalDateTime scoreAt;
 
+    @ApiModelProperty(value = "排序")
+    private Integer sortNo;
 }

src/main/java/com/ydool/boot/modules/rddb/entity/ReviewWorkUser.java

@@ -3,6 +3,7 @@ package com.ydool.boot.modules.rddb.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydool.boot.core.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -65,4 +66,6 @@ public class ReviewWorkUser extends BaseEntity{
     )
     private LocalDateTime scoreAt;
 
+    @ApiModelProperty(value = "排序")
+    private Integer sortNo;
 }

src/main/java/com/ydool/boot/modules/rddb/service/AppointService.java

@@ -1,10 +1,12 @@
 package com.ydool.boot.modules.rddb.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ydool.boot.common.result.Ret;
 import com.ydool.boot.core.exception.ResultException;
@@ -27,9 +29,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -243,7 +243,7 @@ public class AppointService extends BaseService<AppointMapper, Appoint> {
     public Ret comment(CommentRequest commentRequest, User loginUser) {
         Appoint appoint = getById(commentRequest.getId());
         Assert.notNull(appoint, "未找到该记录");
-        AppointComment appointComment = BeanUtil.copyProperties(commentRequest, AppointComment.class,"id");
+        AppointComment appointComment = BeanUtil.copyProperties(commentRequest, AppointComment.class, "id");
         appointComment.setAppointId(commentRequest.getId());
         appointComment.setCreatedId(loginUser.getId());
         appointComment.setUserId(loginUser.getId());
@@ -253,6 +253,7 @@ public class AppointService extends BaseService<AppointMapper, Appoint> {
     }
 
     /*公用*/
+
     /**
      * @param appointId
      * @param userIds
@@ -263,7 +264,17 @@ public class AppointService extends BaseService<AppointMapper, Appoint> {
         if (StrUtil.isNotBlank(userIds)) {
             List<String> userIdList = Arrays.asList(userIds.split(","));
             List<AppointUser> userList = new ArrayList<>();
-            userIdList.forEach(userId -> {
+
+            QueryWrapper maxQw = new QueryWrapper<>()
+                    .select("  IFNULL( max(sort_no),0) as sortNo")
+                    .eq("appoint_id", appointId)
+                    .eq("type", state);
+            Map map = appointUserService.getMap(maxQw);
+            int sortNo = Convert.toInt(map.get("sortNo"));
+
+            Iterator<String> iterator = userIdList.iterator();
+            while (iterator.hasNext()) {
+                String userId = iterator.next();
                 //1.已存在的不管
                 int count = appointUserService.count(new LambdaQueryWrapper<AppointUser>()
                         .eq(AppointUser::getAppointId, appointId)
@@ -279,12 +290,12 @@ public class AppointService extends BaseService<AppointMapper, Appoint> {
                     item.setAppointId(appointId);
                     item.setCreatedId(loginUser.getId());
                     item.setCreatedAt(LocalDateTime.now());
-
+                    item.setSortNo(sortNo++);
                     //如果是投票人员默认待投票状态
                     if (Appoint.STATE_VOTE.equals(state)) item.setVote(0);
                     userList.add(item);
                 }
-            });
+            }
             //3.删除本来有而现在没有的
             appointUserService.remove(new LambdaQueryWrapper<AppointUser>()
                     .eq(AppointUser::getAppointId, appointId)

src/main/java/com/ydool/boot/modules/rddb/service/ContactDbService.java

@@ -1,10 +1,12 @@
 package com.ydool.boot.modules.rddb.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ydool.boot.common.result.Ret;
 import com.ydool.boot.core.exception.ResultException;
@@ -25,9 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -279,11 +279,26 @@ public class ContactDbService extends BaseService<ContactDbMapper, ContactDb> {
      */
     private void saveUser(String contactDbId, String userIds, User loginUser, Integer type, String identity) {
         if (StrUtil.isNotBlank(userIds)) {
+            QueryWrapper maxQw = new QueryWrapper<>()
+                    .select("  IFNULL( max(sort_no),0) as sortNo")
+                    .eq("contact_db_id", contactDbId)
+                    .eq("type", type)
+                    .eq("identity", identity)
+                    ;
+            Map map = contactDbUserService.getMap(maxQw);
+            int sortNo = Convert.toInt(map.get("sortNo"));
+
             List<String> userIdList = Arrays.asList(userIds.split(","));
             List<ContactDbUser> userList = new ArrayList<>();
-            userIdList.forEach(userId -> {
+            Iterator<String> iterator = userIdList.iterator();
+            while(iterator.hasNext()){
+                String userId = iterator.next();
                 //1.已存在的不管
-                int count = contactDbUserService.count(new LambdaQueryWrapper<ContactDbUser>().eq(ContactDbUser::getContactDbId, contactDbId).eq(ContactDbUser::getUserId, userId).eq(ContactDbUser::getType, type).eq(StrUtil.isNotBlank(identity), ContactDbUser::getIdentity, identity));
+                int count = contactDbUserService.count(new LambdaQueryWrapper<ContactDbUser>()
+                        .eq(ContactDbUser::getContactDbId, contactDbId)
+                        .eq(ContactDbUser::getUserId, userId)
+                        .eq(ContactDbUser::getType, type)
+                        .eq(StrUtil.isNotBlank(identity), ContactDbUser::getIdentity, identity));
                 if (count == 0) {
                     //2.只插入新的
                     User user = userService.getById(userId);
@@ -294,10 +309,11 @@ public class ContactDbService extends BaseService<ContactDbMapper, ContactDb> {
                     item.setContactDbId(contactDbId);
                     item.setCreatedId(loginUser.getId());
                     item.setCreatedAt(LocalDateTime.now());
+                    item.setSortNo(sortNo++);
                     if (StrUtil.isNotBlank(identity)) item.setIdentity(identity);
                     userList.add(item);
                 }
-            });
+            }
             //3.删除本来有而现在没有的
             contactDbUserService.remove(new LambdaQueryWrapper<ContactDbUser>().eq(ContactDbUser::getContactDbId, contactDbId).eq(ContactDbUser::getType, type).notIn(ContactDbUser::getUserId, userIdList).eq(StrUtil.isNotBlank(identity), ContactDbUser::getIdentity, identity));
             contactDbUserService.saveBatch(userList);

src/main/java/com/ydool/boot/modules/rddb/service/ReviewOfficerService.java

@@ -2,10 +2,12 @@ package com.ydool.boot.modules.rddb.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ydool.boot.common.result.Ret;
 import com.ydool.boot.core.exception.ResultException;
@@ -28,10 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -273,9 +272,17 @@ public class ReviewOfficerService extends BaseService<ReviewOfficerMapper, Revie
      */
     private void saveReviewOfficerUser(String reviewId, String userIds, User loginUser) {
         if (StrUtil.isNotBlank(userIds)) {
+            QueryWrapper maxQw = new QueryWrapper<>()
+                    .select("  IFNULL( max(sort_no),0) as sortNo")
+                    .eq("review_id", reviewId);
+            Map map = reviewOfficerUserService.getMap(maxQw);
+            int sortNo = Convert.toInt(map.get("sortNo"));
+
             List<String> userIdList = Arrays.asList(userIds.split(","));
             List<ReviewOfficerUser> userList = new ArrayList<>();
-            userIdList.forEach(userId -> {
+            Iterator<String> iterator = userIdList.iterator();
+            while(iterator.hasNext()){
+                String userId = iterator.next();
                 //1.已存在的不管
                 int count = reviewOfficerUserService.count(new LambdaQueryWrapper<ReviewOfficerUser>()
                         .eq(ReviewOfficerUser::getReviewId, reviewId)
@@ -290,9 +297,10 @@ public class ReviewOfficerService extends BaseService<ReviewOfficerMapper, Revie
                     item.setReviewId(reviewId);
                     item.setCreatedId(loginUser.getId());
                     item.setCreatedAt(LocalDateTime.now());
+                    item.setSortNo(sortNo++);
                     userList.add(item);
                 }
-            });
+            }
             //3.删除本来有而现在没有的
             reviewOfficerUserService.remove(new LambdaQueryWrapper<ReviewOfficerUser>()
                     .eq(ReviewOfficerUser::getReviewId, reviewId)

src/main/java/com/ydool/boot/modules/rddb/service/ReviewSubjectService.java

@@ -2,10 +2,12 @@ package com.ydool.boot.modules.rddb.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ydool.boot.common.result.Ret;
 import com.ydool.boot.core.exception.ResultException;
@@ -28,10 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -273,9 +272,17 @@ public class ReviewSubjectService extends BaseService<ReviewSubjectMapper, Revie
      */
     private void saveReviewSubjectUser(String reviewId, String userIds, User loginUser) {
         if (StrUtil.isNotBlank(userIds)) {
+            QueryWrapper maxQw = new QueryWrapper<>()
+                    .select("  IFNULL( max(sort_no),0) as sortNo")
+                    .eq("review_id", reviewId);
+            Map map = reviewSubjectUserService.getMap(maxQw);
+            int sortNo = Convert.toInt(map.get("sortNo"));
+
             List<String> userIdList = Arrays.asList(userIds.split(","));
             List<ReviewSubjectUser> userList = new ArrayList<>();
-            userIdList.forEach(userId -> {
+            Iterator<String> iterator = userIdList.iterator();
+            while(iterator.hasNext()){
+                String userId = iterator.next();
                 //1.已存在的不管
                 int count = reviewSubjectUserService.count(new LambdaQueryWrapper<ReviewSubjectUser>()
                         .eq(ReviewSubjectUser::getReviewId, reviewId)
@@ -290,9 +297,10 @@ public class ReviewSubjectService extends BaseService<ReviewSubjectMapper, Revie
                     item.setReviewId(reviewId);
                     item.setCreatedId(loginUser.getId());
                     item.setCreatedAt(LocalDateTime.now());
+                    item.setSortNo(sortNo++);
                     userList.add(item);
                 }
-            });
+            }
             //3.删除本来有而现在没有的
             reviewSubjectUserService.remove(new LambdaQueryWrapper<ReviewSubjectUser>()
                     .eq(ReviewSubjectUser::getReviewId, reviewId)

src/main/java/com/ydool/boot/modules/rddb/service/ReviewSuperviseService.java

@@ -1,15 +1,20 @@
 package com.ydool.boot.modules.rddb.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ydool.boot.common.result.Ret;
 import com.ydool.boot.core.exception.ResultException;
 import com.ydool.boot.core.service.BaseService;
-import com.ydool.boot.modules.rddb.entity.*;
+import com.ydool.boot.modules.rddb.entity.ReviewSupervise;
+import com.ydool.boot.modules.rddb.entity.ReviewSuperviseAttachment;
+import com.ydool.boot.modules.rddb.entity.ReviewSuperviseComment;
+import com.ydool.boot.modules.rddb.entity.ReviewSuperviseUser;
 import com.ydool.boot.modules.rddb.entity.bo.ReviewSuperviseBo;
 import com.ydool.boot.modules.rddb.entity.request.CommentRequest;
 import com.ydool.boot.modules.rddb.entity.request.ScoreRequest;
@@ -26,9 +31,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -196,11 +199,23 @@ public class ReviewSuperviseService extends BaseService<ReviewSuperviseMapper, R
      */
     private void saveUser(String reviewSuperviseId, String userIds, User loginUser, String type) {
         if (StrUtil.isNotBlank(userIds)) {
+            QueryWrapper maxQw = new QueryWrapper<>()
+                    .select("  IFNULL( max(sort_no),0) as sortNo")
+                    .eq("review_supervise_id", reviewSuperviseId)
+                    .eq("type", type);
+            Map map = reviewSuperviseUserService.getMap(maxQw);
+            int sortNo = Convert.toInt(map.get("sortNo"));
+
             List<String> userIdList = Arrays.asList(userIds.split(","));
             List<ReviewSuperviseUser> userList = new ArrayList<>();
-            userIdList.forEach(userId -> {
+            Iterator<String> iterator = userIdList.iterator();
+            while(iterator.hasNext()){
+                String userId = iterator.next();
                 //1.已存在的不管
-                int count = reviewSuperviseUserService.count(new LambdaQueryWrapper<ReviewSuperviseUser>().eq(ReviewSuperviseUser::getReviewSuperviseId, reviewSuperviseId).eq(ReviewSuperviseUser::getUserId, userId).eq(ReviewSuperviseUser::getType, type));
+                int count = reviewSuperviseUserService.count(new LambdaQueryWrapper<ReviewSuperviseUser>()
+                        .eq(ReviewSuperviseUser::getReviewSuperviseId, reviewSuperviseId)
+                        .eq(ReviewSuperviseUser::getUserId, userId)
+                        .eq(ReviewSuperviseUser::getType, type));
                 if (count == 0) {
                     //2.只插入新的
                     User user = userService.getById(userId);
@@ -211,9 +226,10 @@ public class ReviewSuperviseService extends BaseService<ReviewSuperviseMapper, R
                     item.setReviewSuperviseId(reviewSuperviseId);
                     item.setCreatedId(loginUser.getId());
                     item.setCreatedAt(LocalDateTime.now());
+                    item.setSortNo(sortNo++);
                     userList.add(item);
                 }
-            });
+            }
             //3.删除本来有而现在没有的
             reviewSuperviseUserService.remove(new LambdaQueryWrapper<ReviewSuperviseUser>().eq(ReviewSuperviseUser::getReviewSuperviseId, reviewSuperviseId).eq(ReviewSuperviseUser::getType, type).notIn(ReviewSuperviseUser::getUserId, userIdList));
             reviewSuperviseUserService.saveBatch(userList);

src/main/java/com/ydool/boot/modules/rddb/service/ReviewWorkService.java

@@ -2,10 +2,12 @@ package com.ydool.boot.modules.rddb.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ydool.boot.common.result.Ret;
 import com.ydool.boot.core.exception.ResultException;
@@ -29,10 +31,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -274,9 +273,17 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
      */
     private void saveReviewWorkUser(String reviewId, String userIds, User loginUser) {
         if (StrUtil.isNotBlank(userIds)) {
+            QueryWrapper maxQw = new QueryWrapper<>()
+                    .select("  IFNULL( max(sort_no),0) as sortNo")
+                    .eq("review_id", reviewId);
+            Map map = reviewWorkUserService.getMap(maxQw);
+            int sortNo = Convert.toInt(map.get("sortNo"));
+
             List<String> userIdList = Arrays.asList(userIds.split(","));
             List<ReviewWorkUser> userList = new ArrayList<>();
-            userIdList.forEach(userId -> {
+            Iterator<String> iterator = userIdList.iterator();
+            while(iterator.hasNext()){
+                String userId = iterator.next();
                 //1.已存在的不管
                 int count = reviewWorkUserService.count(new LambdaQueryWrapper<ReviewWorkUser>()
                         .eq(ReviewWorkUser::getReviewId, reviewId)
@@ -291,9 +298,10 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
                     item.setReviewId(reviewId);
                     item.setCreatedId(loginUser.getId());
                     item.setCreatedAt(LocalDateTime.now());
+                    item.setSortNo(sortNo++);
                     userList.add(item);
                 }
-            });
+            }
             //3.删除本来有而现在没有的
             reviewWorkUserService.remove(new LambdaQueryWrapper<ReviewWorkUser>()
                     .eq(ReviewWorkUser::getReviewId, reviewId)

src/main/java/com/ydool/boot/modules/rddb/web/AppointUserController.java

@@ -43,7 +43,7 @@ public class AppointUserController extends BaseAdminController {
         QueryWrapper<AppointUser> wrapper = new QueryWrapper<>();
         wrapper.eq("appoint_id", id);
         wrapper.eq("type", type);
-        wrapper.orderByDesc("created_at");
+        wrapper.orderByAsc("sort_no");
         Page page = appointUserService.page(new Page(getPageNum(), getPageSize()), wrapper);
         render(Ret.ok().paged(page));
     }
@@ -68,6 +68,7 @@ public class AppointUserController extends BaseAdminController {
         userQueryWrapper.eq("account_type", "admin");
         if(StrUtil.isNotBlank(userName)) userQueryWrapper.like("user_name",userName);
         userQueryWrapper.like(StrUtil.isNotBlank(loginName),"AES_DECRYPT(from_base64 (login_name),'"+ CodecUtils.KEY +"')",loginName);
+        userQueryWrapper.orderByAsc("convert(user_name using GBK)");
         Page page = userService.page(new Page(getPageNum(), getPageSize()), userQueryWrapper);
         render(Ret.ok().paged(UserDtoWrapper.build().pageVO(page)));
     }

src/main/java/com/ydool/boot/modules/rddb/web/ContactDbUserController.java

@@ -40,7 +40,7 @@ public class ContactDbUserController extends BaseController {
         wrapper.eq("contact_db_id", id);
         wrapper.eq("type", type);
         wrapper.eq("identity", identity);
-        wrapper.orderByDesc("created_at");
+        wrapper.orderByAsc("sort_no");
         Page page = contactDbUserService.page(new Page(getPageNum(), getPageSize()), wrapper);
         render(Ret.ok().paged(page));
     }
@@ -55,7 +55,7 @@ public class ContactDbUserController extends BaseController {
         QueryWrapper<ContactDbUser> wrapper = new QueryWrapper<>();
         wrapper.eq("contact_db_id", id);
         wrapper.eq("type", type);
-        wrapper.orderByDesc("created_at");
+        wrapper.orderByAsc("sort_no");
         Page page = contactDbUserService.page(new Page(getPageNum(), getPageSize()), wrapper);
         render(Ret.ok().paged(page));
     }

src/main/java/com/ydool/boot/modules/rddb/web/ReviewOfficerUserController.java

@@ -43,7 +43,7 @@ public class ReviewOfficerUserController extends BaseAdminController {
     public void list(String id) {
         QueryWrapper<ReviewOfficerUser> wrapper = new QueryWrapper<>();
         wrapper.eq("review_id", id);
-        wrapper.orderByDesc("created_at");
+        wrapper.orderByAsc("sort_no");
         Page page = reviewOfficerUserService.page(new Page(getPageNum(), getPageSize()), wrapper);
         render(Ret.ok().paged(page));
     }
@@ -68,6 +68,7 @@ public class ReviewOfficerUserController extends BaseAdminController {
         //县级工作人员
         userQueryWrapper.eq("account_type", "admin");
         userQueryWrapper.like(StrUtil.isNotBlank(loginName), "AES_DECRYPT(from_base64 (login_name),'" + CodecUtils.KEY + "')", loginName);
+        userQueryWrapper.orderByAsc("convert(user_name using GBK)");
         Page page = userService.page(new Page(getPageNum(), getPageSize()), userQueryWrapper);
         render(Ret.ok().paged(UserDtoWrapper.build().pageVO(page)));
     }

src/main/java/com/ydool/boot/modules/rddb/web/ReviewSubjectUserController.java

@@ -43,7 +43,7 @@ public class ReviewSubjectUserController extends BaseAdminController {
     public void list(String id) {
         QueryWrapper<ReviewSubjectUser> wrapper = new QueryWrapper<>();
         wrapper.eq("review_id", id);
-        wrapper.orderByDesc("created_at");
+        wrapper.orderByAsc("sort_no");
         Page page = reviewSubjectUserService.page(new Page(getPageNum(), getPageSize()), wrapper);
         render(Ret.ok().paged(page));
     }
@@ -68,6 +68,7 @@ public class ReviewSubjectUserController extends BaseAdminController {
         //县级工作人员
         userQueryWrapper.eq("account_type", "admin");
         userQueryWrapper.like(StrUtil.isNotBlank(loginName), "AES_DECRYPT(from_base64 (login_name),'" + CodecUtils.KEY + "')", loginName);
+        userQueryWrapper.orderByAsc("convert(user_name using GBK)");
         Page page = userService.page(new Page(getPageNum(), getPageSize()), userQueryWrapper);
         render(Ret.ok().paged(UserDtoWrapper.build().pageVO(page)));
     }

src/main/java/com/ydool/boot/modules/rddb/web/ReviewSuperviseUserController.java

@@ -37,7 +37,7 @@ public class ReviewSuperviseUserController extends BaseController {
         LambdaQueryWrapper<ReviewSuperviseUser> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ReviewSuperviseUser::getReviewSuperviseId, id);
         wrapper.eq(ReviewSuperviseUser::getType, type);
-        wrapper.orderByDesc(ReviewSuperviseUser::getCreatedAt);
+        wrapper.orderByAsc(ReviewSuperviseUser::getSortNo);
         Page page = reviewsuperviseUserService.page(new Page(getPageNum(), getPageSize()), wrapper);
         render(Ret.ok().paged(page));
     }

src/main/java/com/ydool/boot/modules/rddb/web/ReviewWorkUserController.java

@@ -42,7 +42,7 @@ public class ReviewWorkUserController extends BaseAdminController {
     public void list(String id) {
         QueryWrapper<ReviewWorkUser> wrapper = new QueryWrapper<>();
         wrapper.eq("review_id", id);
-        wrapper.orderByDesc("created_at");
+        wrapper.orderByAsc("sort_no");
         Page page = reviewWorkUserService.page(new Page(getPageNum(), getPageSize()), wrapper);
         render(Ret.ok().paged(page));
     }
@@ -67,6 +67,7 @@ public class ReviewWorkUserController extends BaseAdminController {
         //县级工作人员
         userQueryWrapper.eq("account_type", "admin");
         userQueryWrapper.like(StrUtil.isNotBlank(loginName), "AES_DECRYPT(from_base64 (login_name),'" + CodecUtils.KEY + "')", loginName);
+        userQueryWrapper.orderByAsc("convert(user_name using GBK)");
         Page page = userService.page(new Page(getPageNum(), getPageSize()), userQueryWrapper);
         render(Ret.ok().paged(UserDtoWrapper.build().pageVO(page)));
     }

src/main/java/com/ydool/boot/modules/rddb/web/_SelectController.java

@@ -68,6 +68,7 @@ public class _SelectController extends BaseController {
         qw.notIn(StrUtil.isNotBlank(userIds),"id", userIds.split(","));
         if (StrUtil.isNotBlank(userName)) qw.like("user_name", userName);
         qw.like(StrUtil.isNotBlank(loginName), "AES_DECRYPT(from_base64 (login_name),'" + CodecUtils.KEY + "')", loginName);
+        qw.orderByAsc("convert(user_name using GBK)");
         Page page = userService.page(new Page(getPageNum(), getPageSize()), qw);
         render(Ret.ok().paged(UserDtoWrapper.build().pageVO(page)));
     }

src/main/java/com/ydool/boot/modules/rddb/wrapper/AppointWrapper.java

@@ -51,15 +51,15 @@ public class AppointWrapper extends BaseWrapper<Appoint, AppointDto> {
         List<AppointUser> conferenceUserList = appointUserService.list(new LambdaQueryWrapper<AppointUser>()
                 .eq(AppointUser::getAppointId, appoint.getId())
                 .eq(AppointUser::getType, Appoint.STATE_CONFERENCE)
-                .orderByDesc(AppointUser::getCreatedAt));
+                .orderByAsc(AppointUser::getSortNo));
         List<AppointUser> voteUserList = appointUserService.list(new LambdaQueryWrapper<AppointUser>()
                 .eq(AppointUser::getAppointId, appoint.getId())
                 .eq(AppointUser::getType, Appoint.STATE_VOTE)
-                .orderByDesc(AppointUser::getCreatedAt));
+                .orderByAsc(AppointUser::getSortNo));
         List<AppointUser> performUserList = appointUserService.list(new LambdaQueryWrapper<AppointUser>()
                 .eq(AppointUser::getAppointId, appoint.getId())
                 .eq(AppointUser::getType, Appoint.STATE_PERFORM)
-                .orderByDesc(AppointUser::getCreatedAt));
+                .orderByAsc(AppointUser::getSortNo));
 
         appointDto.setProposeAttachmentList(proposeAttachmentList);
         appointDto.setConferenceAttachmentList(conferenceAttachmentList);

src/main/java/com/ydool/boot/modules/rddb/wrapper/ContactDbWrapper.java

@@ -47,29 +47,29 @@ public class ContactDbWrapper extends BaseWrapper<ContactDb, ContactDbDto> {
         List<ContactDbUser> subjectUserList = contactDbUserService.list(new LambdaQueryWrapper<ContactDbUser>()
                 .eq(ContactDbUser::getContactDbId, contactDb.getId())
                 .eq(ContactDbUser::getType, ContactDb.STATE_SUBJECT)
-                .orderByDesc(ContactDbUser::getCreatedAt));
+                .orderByAsc(ContactDbUser::getSortNo));
         List<ContactDbUser> chooseAdminUserList = contactDbUserService.list(new LambdaQueryWrapper<ContactDbUser>()
                 .eq(ContactDbUser::getContactDbId, contactDb.getId())
                 .eq(ContactDbUser::getType, ContactDb.STATE_CHOOSE)
                 .eq(ContactDbUser::getIdentity, Const.TYPE_ADMIN)
-                .orderByDesc(ContactDbUser::getCreatedAt));
+                .orderByAsc(ContactDbUser::getSortNo));
         List<ContactDbUser> chooseDbUserList = contactDbUserService.list(new LambdaQueryWrapper<ContactDbUser>()
                 .eq(ContactDbUser::getContactDbId, contactDb.getId())
                 .eq(ContactDbUser::getType, ContactDb.STATE_CHOOSE)
                 .eq(ContactDbUser::getIdentity, Const.TYPE_RDDB)
-                .orderByDesc(ContactDbUser::getCreatedAt));
+                .orderByAsc(ContactDbUser::getSortNo));
         List<ContactDbUser> signUserList = contactDbUserService.list(new LambdaQueryWrapper<ContactDbUser>()
                 .eq(ContactDbUser::getContactDbId, contactDb.getId())
                 .eq(ContactDbUser::getType, ContactDb.STATE_SIGN)
-                .orderByDesc(ContactDbUser::getCreatedAt));
+                .orderByAsc(ContactDbUser::getSortNo));
         List<ContactDbUser> conferenceUserList = contactDbUserService.list(new LambdaQueryWrapper<ContactDbUser>()
                 .eq(ContactDbUser::getContactDbId, contactDb.getId())
                 .eq(ContactDbUser::getType, ContactDb.STATE_CONFERENCE)
-                .orderByDesc(ContactDbUser::getCreatedAt));
+                .orderByAsc(ContactDbUser::getSortNo));
         List<ContactDbUser> evaluateUserList = contactDbUserService.list(new LambdaQueryWrapper<ContactDbUser>()
                 .eq(ContactDbUser::getContactDbId, contactDb.getId())
                 .eq(ContactDbUser::getType, ContactDb.STATE_EVALUATE)
-                .orderByDesc(ContactDbUser::getCreatedAt));
+                .orderByAsc(ContactDbUser::getSortNo));
         dto.setSubjectUserList(subjectUserList);
         dto.setChooseAdminUserList(chooseAdminUserList);
         dto.setChooseDbUserList(chooseDbUserList);

src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewOfficerWrapper.java

@@ -60,14 +60,15 @@ public class ReviewOfficerWrapper extends BaseWrapper<ReviewOfficer, ReviewOffic
         List<ReviewOfficerAudit> inReportAudit1List = reviewOfficerAuditService.list(new LambdaQueryWrapper<ReviewOfficerAudit>()
                 .eq(ReviewOfficerAudit::getReviewId, reviewOfficer.getId())
                 .eq(ReviewOfficerAudit::getLevel, 1)
-                .orderByDesc(ReviewOfficerAudit::getCreatedAt));
+                .orderByAsc(ReviewOfficerAudit::getSortNo));
         List<ReviewOfficerAudit> inReportAudit2List = reviewOfficerAuditService.list(new LambdaQueryWrapper<ReviewOfficerAudit>()
                 .eq(ReviewOfficerAudit::getReviewId, reviewOfficer.getId())
                 .eq(ReviewOfficerAudit::getLevel, 2)
-                .orderByDesc(ReviewOfficerAudit::getCreatedAt));
+                .orderByAsc(ReviewOfficerAudit::getSortNo));
+
         List<ReviewOfficerUser> checkUserList = reviewOfficerUserService.list(new LambdaQueryWrapper<ReviewOfficerUser>()
                 .eq(ReviewOfficerUser::getReviewId, reviewOfficer.getId())
-                .orderByDesc(ReviewOfficerUser::getCreatedAt));
+                .orderByAsc(ReviewOfficerUser::getSortNo));
 
         ReviewOfficerDto.setInReportAttachmentList(inReportAttachmentList);
         ReviewOfficerDto.setCheckAttachmentList(checkAttachmentList);

src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewSubjectWrapper.java

@@ -58,14 +58,14 @@ public class ReviewSubjectWrapper extends BaseWrapper<ReviewSubject, ReviewSubje
         List<ReviewSubjectAudit> inReportAudit1List = reviewSubjectAuditService.list(new LambdaQueryWrapper<ReviewSubjectAudit>()
                 .eq(ReviewSubjectAudit::getReviewId, reviewSubject.getId())
                 .eq(ReviewSubjectAudit::getLevel, 1)
-                .orderByDesc(ReviewSubjectAudit::getCreatedAt));
+                .orderByAsc(ReviewSubjectAudit::getSortNo));
         List<ReviewSubjectAudit> inReportAudit2List = reviewSubjectAuditService.list(new LambdaQueryWrapper<ReviewSubjectAudit>()
                 .eq(ReviewSubjectAudit::getReviewId, reviewSubject.getId())
                 .eq(ReviewSubjectAudit::getLevel, 2)
-                .orderByDesc(ReviewSubjectAudit::getCreatedAt));
+                .orderByAsc(ReviewSubjectAudit::getSortNo));
         List<ReviewSubjectUser> checkUserList = reviewSubjectUserService.list(new LambdaQueryWrapper<ReviewSubjectUser>()
                 .eq(ReviewSubjectUser::getReviewId, reviewSubject.getId())
-                .orderByDesc(ReviewSubjectUser::getCreatedAt));
+                .orderByAsc(ReviewSubjectUser::getSortNo));
 
         ReviewSubjectDto.setInReportAttachmentList(inReportAttachmentList);
         ReviewSubjectDto.setCheckAttachmentList(checkAttachmentList);

src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewSuperviseWrapper.java

@@ -63,7 +63,7 @@ public class ReviewSuperviseWrapper extends BaseWrapper<ReviewSupervise, ReviewS
         List<ReviewSuperviseUser> evaluateUserList = reviewSuperviseUserService.list(new LambdaQueryWrapper<ReviewSuperviseUser>()
                 .eq(ReviewSuperviseUser::getReviewSuperviseId, reviewSupervise.getId())
                 .eq(ReviewSuperviseUser::getType, ReviewSuperviseUser.TYPE_EVALUATE)
-                .orderByDesc(ReviewSuperviseUser::getCreatedAt));
+                .orderByAsc(ReviewSuperviseUser::getSortNo));
         dto.setEvaluateUserList(evaluateUserList);
 
         //打分结束算平均分

src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewWorkWrapper.java

@@ -15,7 +15,6 @@ import com.ydool.boot.modules.rddb.entity.dto.ReviewWorkDto;
 import com.ydool.boot.modules.rddb.service.ReviewWorkAttachmentService;
 import com.ydool.boot.modules.rddb.service.ReviewWorkAuditService;
 import com.ydool.boot.modules.rddb.service.ReviewWorkUserService;
-import org.springframework.jdbc.core.JdbcTemplate;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -38,7 +37,6 @@ public class ReviewWorkWrapper extends BaseWrapper<ReviewWork, ReviewWorkDto> {
         ReviewWorkAttachmentService reviewWorkAttachmentService = SpringUtils.getBean(ReviewWorkAttachmentService.class);
         ReviewWorkUserService reviewWorkUserService = SpringUtils.getBean(ReviewWorkUserService.class);
         ReviewWorkAuditService reviewWorkAuditService = SpringUtils.getBean(ReviewWorkAuditService.class);
-        JdbcTemplate jdbcTemplate = SpringUtils.getBean(JdbcTemplate.class);
 
         List<ReviewWorkAttachment> inReportAttachmentList = reviewWorkAttachmentService.list(new LambdaQueryWrapper<ReviewWorkAttachment>()
                 .eq(ReviewWorkAttachment::getReviewId, reviewWork.getId())
@@ -60,14 +58,14 @@ public class ReviewWorkWrapper extends BaseWrapper<ReviewWork, ReviewWorkDto> {
         List<ReviewWorkAudit> inReportAudit1List = reviewWorkAuditService.list(new LambdaQueryWrapper<ReviewWorkAudit>()
                 .eq(ReviewWorkAudit::getReviewId, reviewWork.getId())
                 .eq(ReviewWorkAudit::getLevel, 1)
-                .orderByDesc(ReviewWorkAudit::getCreatedAt));
+                .orderByAsc(ReviewWorkAudit::getSortNo));
         List<ReviewWorkAudit> inReportAudit2List = reviewWorkAuditService.list(new LambdaQueryWrapper<ReviewWorkAudit>()
                 .eq(ReviewWorkAudit::getReviewId, reviewWork.getId())
                 .eq(ReviewWorkAudit::getLevel, 2)
-                .orderByDesc(ReviewWorkAudit::getCreatedAt));
+                .orderByAsc(ReviewWorkAudit::getSortNo));
         List<ReviewWorkUser> checkUserList = reviewWorkUserService.list(new LambdaQueryWrapper<ReviewWorkUser>()
                 .eq(ReviewWorkUser::getReviewId, reviewWork.getId())
-                .orderByDesc(ReviewWorkUser::getCreatedAt));
+                .orderByAsc(ReviewWorkUser::getSortNo));
 
         ReviewWorkDto.setInReportAttachmentList(inReportAttachmentList);
         ReviewWorkDto.setCheckAttachmentList(checkAttachmentList);

src/main/resources/views/dist/css/chunk-1b1ecef0.ffcf6be7.css

@@ -0,0 +1 @@
+.list[data-v-657dc842]{padding:.34667rem .42667rem 0}.list .item[data-v-657dc842]{display:flex;align-items:center;padding:.69333rem .42667rem;background-color:#fff;border-radius:.10667rem;margin-bottom:.32rem}.list .item .icon[data-v-657dc842]{width:.53333rem;margin-right:.26667rem}.list .item .title[data-v-657dc842]{flex:1;font-size:.42667rem;color:#333;line-height:.58667rem}.list .item .van-icon[data-v-657dc842]{font-size:.37333rem}

src/main/resources/views/dist/css/chunk-57338a34.481e1e85.css

@@ -1 +0,0 @@
-.list[data-v-789b3e4a]{padding:.34667rem .42667rem 0}.list .item[data-v-789b3e4a]{display:flex;align-items:center;padding:.69333rem .42667rem;background-color:#fff;border-radius:.10667rem;margin-bottom:.32rem}.list .item .icon[data-v-789b3e4a]{width:.53333rem;margin-right:.26667rem}.list .item .title[data-v-789b3e4a]{flex:1;font-size:.42667rem;color:#333;line-height:.58667rem}.list .item .van-icon[data-v-789b3e4a]{font-size:.37333rem}

src/main/resources/views/dist/css/chunk-6ebeb74e.071b4fbe.css

@@ -0,0 +1 @@
+.list[data-v-24bfffd9]{padding:.34667rem .42667rem 0}.list .item[data-v-24bfffd9]{display:flex;align-items:center;padding:.69333rem .42667rem;background-color:#fff;border-radius:.10667rem;margin-bottom:.32rem}.list .item .icon[data-v-24bfffd9]{width:.53333rem;margin-right:.26667rem}.list .item .title[data-v-24bfffd9]{flex:1;font-size:.42667rem;color:#333;line-height:.58667rem}.list .item .van-icon[data-v-24bfffd9]{font-size:.37333rem}