1

README.md

@@ -33,5 +33,6 @@ __
 manage:
   share:
     scene: YZL-jm-Z7xsq0T8502,SG-jm-JT77TjCZwF5
-  push-jm: abc
+  push-jm:
+    url: abc
 ~~~~

src/main/java/com/fdkankan/manage/service/impl/DictServiceImpl.java

@@ -41,6 +41,7 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
         wrapper.eq(Dict::getDictKey,dictKey);
         wrapper.and(e -> e.eq(Dict::getSysUserId,StpUtil.getLoginId()).or().eq(Dict::getIsSystem,1));
         //wrapper.eq(Dict::getSysUserId, StpUtil.getLoginId());
+        wrapper.orderByDesc(Dict::getIsSystem);
         wrapper.orderByAsc(Dict::getSort);
         wrapper.orderByDesc(Dict::getId);
         return list(wrapper);
@@ -59,6 +60,7 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
         wrapper.and(e -> e.eq(Dict::getSysUserId,StpUtil.getLoginId()).or().eq(Dict::getIsSystem,1));
 
         //wrapper.eq(Dict::getSysUserId, StpUtil.getLoginId());
+        wrapper.orderByDesc(Dict::getIsSystem);
         wrapper.orderByAsc(Dict::getSort);
         wrapper.orderByDesc(Dict::getId);
         Page<Dict> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);

src/main/resources/mapper/manage/DictFileMapper.xml

@@ -41,7 +41,7 @@
             </foreach>
         </if>
 
-        order by df.id desc
+        order by df.is_system desc , df.id desc
 
         </select>
 </mapper>