标签排序修改

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml

@@ -34,7 +34,7 @@
 				</otherwise>
 			</choose>
 		</if>
-		order by create_time desc
+		order by sort_order
 	</select>
 
 	<select id="getFieldInfo" resultType="java.lang.String">

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml

@@ -166,6 +166,6 @@
 			</choose>
 		</if>
 
-		order by d.order_num desc
+		order by d.order_num
 	</select>
 </mapper>

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java

@@ -378,6 +378,7 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 			} else {
 				queryWrapper.eq("pid", 0);
 			}
+			if (list(queryWrapper).size() > 0) {
 				Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysCategory.getId()))
 						.map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0);
 				queryWrapper.eq("sort_order", inputOrderNum);
@@ -414,6 +415,7 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 				}
 			}
 		}
+	}
 
 	@Override
 	public List<SysCategory> queryPid(SysCategory sysCategory) {

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java

@@ -65,7 +65,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
             queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0)
                     .eq("dict_id",sysDictItem.getDictId())
                     .eq("is_tag_dict",sysDictItem.getIsTagDict())
-                    .orderByDesc("sort_order");
+                    .orderByAsc("sort_order");
             queryWrapper.eq("sort_order", inputOrderNum);
             Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper);
             if (orderNumCount > 0) {//有重复展示顺序的,后面的号全+1
@@ -105,6 +105,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
                     .eq("dict_id", sysDictItem.getDictId())
                     .eq("is_tag_dict", sysDictItem.getIsTagDict())
                     .orderByAsc("sort_order");
+            if (list(queryWrapper).size() > 0) {
                 Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysDictItem.getId()))
                         .map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0);
                 queryWrapper.eq("sort_order", inputOrderNum);
@@ -136,3 +137,4 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
             }
         }
     }
+}