diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java index 30c5b30..e6c5c40 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java @@ -52,6 +52,7 @@ public class SysScaleServiceImpl implements ISysScaleService { @Override public TableDataInfo queryPageList(SysScaleBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc(SysScale::getUpdateTime); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); for (SysScaleVo record : result.getRecords()) { List scaleTypeList = sysDictDataMapper.selectDictDataByTypeAndDictValue("scale_type", StrUtil.join(StrUtil.COMMA, record.getScaleType())); @@ -72,6 +73,7 @@ public class SysScaleServiceImpl implements ISysScaleService { @Override public List queryList(SysScaleBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc(SysScale::getPublishNums); return baseMapper.selectVoList(lqw); } @@ -83,7 +85,6 @@ public class SysScaleServiceImpl implements ISysScaleService { if(CollUtil.isNotEmpty(bo.getScaleType())){ lqw.like(CollUtil.isNotEmpty(bo.getScaleType()), SysScale::getScaleType, bo.getScaleType().get(0)); } - lqw.orderByDesc(SysScale::getUpdateTime); return lqw; } diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/word/groupTemplate-bak.docx b/ruoyi-modules/rouyi-scale/src/main/resources/word/groupTemplate-bak.docx deleted file mode 100644 index 7cd429c..0000000 Binary files a/ruoyi-modules/rouyi-scale/src/main/resources/word/groupTemplate-bak.docx and /dev/null differ diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/word/groupTemplate.docx b/ruoyi-modules/rouyi-scale/src/main/resources/word/groupTemplate.docx deleted file mode 100644 index 1d59783..0000000 Binary files a/ruoyi-modules/rouyi-scale/src/main/resources/word/groupTemplate.docx and /dev/null differ diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/word/personalTemplate-bak.docx b/ruoyi-modules/rouyi-scale/src/main/resources/word/personalTemplate-bak.docx deleted file mode 100644 index 1ec887e..0000000 Binary files a/ruoyi-modules/rouyi-scale/src/main/resources/word/personalTemplate-bak.docx and /dev/null differ diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/word/personalTemplate-bak2.docx b/ruoyi-modules/rouyi-scale/src/main/resources/word/personalTemplate-bak2.docx deleted file mode 100644 index 06af6b6..0000000 Binary files a/ruoyi-modules/rouyi-scale/src/main/resources/word/personalTemplate-bak2.docx and /dev/null differ diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/word/personalTemplate.docx b/ruoyi-modules/rouyi-scale/src/main/resources/word/personalTemplate.docx deleted file mode 100644 index 0223b87..0000000 Binary files a/ruoyi-modules/rouyi-scale/src/main/resources/word/personalTemplate.docx and /dev/null differ