浏览代码

分类开发

qt5107 2 年之前
父节点
当前提交
61dfe5039e

+ 1 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/service/classify/impl/ClassifyServiceImpl.java

@@ -88,7 +88,7 @@ public class ClassifyServiceImpl extends ServiceImpl<ClassifyMapper, Classify> i
         }
         }
 
 
         //查询数据
         //查询数据
-        List<Classify> classifies = lambdaQuery().eq(Classify::getType, entity.getType()).apply(Func.isNotEmpty(entity.getName()), "instr(`name`, '" + entity.getName() + "') > 0").list();
+        List<Classify> classifies = lambdaQuery().eq(Classify::getType, entity.getType()).apply(Func.isNotEmpty(entity.getName()), "instr(`name`, '" + entity.getName() + "') > 0").orderByAsc(Classify::getId).list();
         if (Func.isEmpty(classifies)) {
         if (Func.isEmpty(classifies)) {
             return new ArrayList<>();
             return new ArrayList<>();
         }
         }

+ 2 - 1
hx-service/victoriatourist/src/main/java/com/fjhx/service/material/impl/MaterialServiceImpl.java

@@ -69,7 +69,8 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
                 .in(Material::getClassifyId, classifyIds)
                 .in(Material::getClassifyId, classifyIds)
                 .apply(Func.isNotEmpty(condition.get("code")), "instr(`code`, '" + condition.get("code") + "') > 0")
                 .apply(Func.isNotEmpty(condition.get("code")), "instr(`code`, '" + condition.get("code") + "') > 0")
                 .apply(Func.isNotEmpty(condition.get("name")), "instr(`name`, '" + condition.get("name") + "') > 0")
                 .apply(Func.isNotEmpty(condition.get("name")), "instr(`name`, '" + condition.get("name") + "') > 0")
-                .and(Func.isNotEmpty(condition.get("keyword")), o -> o.apply("instr(`code`, '" + condition.get("keyword") + "') > 0").or().apply("instr(`name`, '" + condition.get("keyword") + "') > 0"));
+                .and(Func.isNotEmpty(condition.get("keyword")), o -> o.apply("instr(`code`, '" + condition.get("keyword") + "') > 0").or().apply("instr(`name`, '" + condition.get("keyword") + "') > 0"))
+                .orderByDesc(Material::getId);
 
 
         return page(condition, wrapper);
         return page(condition, wrapper);
     }
     }