From 5e26a1bc95bdb447da3b9fac73bfd9eb62ab2230 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Fri, 29 Jul 2022 14:09:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/BasePictureLocationController.java  | 8 ++++----
 .../java/com/ruoyi/system/domain/BasePictureLocation.java | 2 ++
 .../resources/mapper/system/BasePictureLocationMapper.xml | 2 ++
 .../templates/system/base_picture_location/add.html       | 3 +++
 .../base_picture_location/base_picture_location.html      | 2 ++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BasePictureLocationController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BasePictureLocationController.java
index 6218e3a..4701db7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BasePictureLocationController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BasePictureLocationController.java
@@ -91,10 +91,10 @@ public class BasePictureLocationController extends BaseController
     @ResponseBody
     public AjaxResult addSave(MultipartFile file, BasePictureLocation basePictureLocation)
     {
-        int tag=basePictureLocationService.countBasePictureLocation(basePictureLocation.getPictureLocation());
-        if (tag>0){
-            return error("当前位置已有图片");
-        }
+//        int tag=basePictureLocationService.countBasePictureLocation(basePictureLocation.getPictureLocation());
+//        if (tag>0){
+//            return error("当前位置已有图片");
+//        }
 
         String filePath = Global.getUploadPath();
         try {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BasePictureLocation.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BasePictureLocation.java
index da6827a..d25a71d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BasePictureLocation.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BasePictureLocation.java
@@ -26,6 +26,7 @@ public class BasePictureLocation extends BaseEntity
     @Excel(name = "显示位置")
     private Long pictureLocation;
 
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -54,6 +55,7 @@ public class BasePictureLocation extends BaseEntity
         return pictureLocation;
     }
 
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ruoyi-system/src/main/resources/mapper/system/BasePictureLocationMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BasePictureLocationMapper.xml
index eea1e25..802c4e1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BasePictureLocationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BasePictureLocationMapper.xml
@@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectBasePictureLocationVo"/>
         <where>  
         </where>
+
+        order by picture_location
     </select>
     
     <select id="selectBasePictureLocationById" parameterType="Long" resultMap="BasePictureLocationResult">
diff --git a/ruoyi-system/src/main/resources/templates/system/base_picture_location/add.html b/ruoyi-system/src/main/resources/templates/system/base_picture_location/add.html
index 198ce1e..3a80da1 100644
--- a/ruoyi-system/src/main/resources/templates/system/base_picture_location/add.html
+++ b/ruoyi-system/src/main/resources/templates/system/base_picture_location/add.html
@@ -32,6 +32,9 @@
                     </select>
                 </div>
             </div>
+
+
+
         </form>
     </div>
     <th:block th:include="include :: footer" />
diff --git a/ruoyi-system/src/main/resources/templates/system/base_picture_location/base_picture_location.html b/ruoyi-system/src/main/resources/templates/system/base_picture_location/base_picture_location.html
index 983137a..4dd1258 100644
--- a/ruoyi-system/src/main/resources/templates/system/base_picture_location/base_picture_location.html
+++ b/ruoyi-system/src/main/resources/templates/system/base_picture_location/base_picture_location.html
@@ -75,6 +75,8 @@
                        return $.table.selectDictLabel(pictureLocationDatas, value);
                     }
                 },
+
+
                 {
                     title: '操作',
                     align: 'center',