From 3d72c781c8c439a4cabd479d70f5645c1880b750 Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Wed, 14 Aug 2024 17:09:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E5=BA=93=E5=B7=A5=E7=A8=8B=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?,=E6=9F=A5=E8=AF=A2=E6=96=87=E4=BB=B6=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/xyt/controller/ResProjectImgController.java      | 5 ++++-
 .../gunshi/project/xyt/mapper/FileAssociationsMapper.java    | 2 +-
 .../java/com/gunshi/project/xyt/model/FileAssociations.java  | 2 +-
 .../gunshi/project/xyt/service/FileAssociationsService.java  | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/ResProjectImgController.java b/src/main/java/com/gunshi/project/xyt/controller/ResProjectImgController.java
index 2537b83..a6d0f03 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/ResProjectImgController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/ResProjectImgController.java
@@ -90,7 +90,10 @@ public class ResProjectImgController extends AbstractCommonFileController{
     @Operation(summary = "列表")
     @PostMapping("/list")
     public R<List<ResProjectImg>> list(@Validated @RequestBody ResCodeSo so) {
-        List<ResProjectImg> list = service.lambdaQuery().eq(ResProjectImg::getResCode, so.getResCode()).list();
+        List<ResProjectImg> list = service.lambdaQuery().eq(ResProjectImg::getResCode, so.getResCode())
+                .orderByAsc(ResProjectImg::getSortOn)
+                .orderByDesc(ResProjectImg::getModitime)
+                .list();
         if (CollectionUtils.isNotEmpty(list)){
             list.forEach(o -> o.setFiles(fileService.getFiles(getGroupId(),String.valueOf( o.getId()))));
         }
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/FileAssociationsMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/FileAssociationsMapper.java
index bef3e3b..4ed08bd 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/FileAssociationsMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/FileAssociationsMapper.java
@@ -27,7 +27,7 @@ public interface FileAssociationsMapper extends BaseMapper<FileAssociations> {
             	file_associations fa
             	LEFT JOIN file_descriptor fd ON fa.file_id = fd.file_id
             WHERE
-                fa.del = 0
+                fa.del = '1'
                 AND fa.business_id = #{businessId}
             	AND fa."table_name" = #{tableName}
             	AND fd.group_id = #{tableName}
diff --git a/src/main/java/com/gunshi/project/xyt/model/FileAssociations.java b/src/main/java/com/gunshi/project/xyt/model/FileAssociations.java
index 069a7d8..a76cbac 100644
--- a/src/main/java/com/gunshi/project/xyt/model/FileAssociations.java
+++ b/src/main/java/com/gunshi/project/xyt/model/FileAssociations.java
@@ -86,7 +86,7 @@ public class FileAssociations implements Serializable {
         */
         @TableField(value="del")
         @Size(max = 1,message = "删除标识最大长度要小于 2")
-        @Schema(description="删除标识0: 未删除,1:已删除")
+        @Schema(description="删除标识1: 未删除,0:已删除")
         @NotBlank(message = "删除标识不能为空")
         private String del;
 
diff --git a/src/main/java/com/gunshi/project/xyt/service/FileAssociationsService.java b/src/main/java/com/gunshi/project/xyt/service/FileAssociationsService.java
index da303ed..13ab47c 100644
--- a/src/main/java/com/gunshi/project/xyt/service/FileAssociationsService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/FileAssociationsService.java
@@ -55,7 +55,7 @@ public class FileAssociationsService extends ServiceImpl<FileAssociationsMapper,
 
                 // 删除
                 if (this.lambdaUpdate()
-                        .set(FileAssociations::getDel, "1")
+                        .set(FileAssociations::getDel, DEL)
                         .eq(FileAssociations::getTableName, tableName)
                         .eq(FileAssociations::getBusinessId, businessId)
                         .in(FileAssociations::getFileId, fileIds)