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(@Validated @RequestBody ResCodeSo so) { - List list = service.lambdaQuery().eq(ResProjectImg::getResCode, so.getResCode()).list(); + List 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 { 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