修改 月

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 {

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)

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">

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" />

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',