tj

microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/controller/LiStationController.java

 package com.devplatform.admin.modules.liresource.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.devplatform.admin.common.utils.AbstractController;
@@ -50,12 +51,9 @@ public class LiStationController extends AbstractController {
       dataType = "Map<String, Object>")
   @PostMapping("/list")
   public R list(@RequestBody LiStationModel model) {
-    if (StringUtils.isBlank(model.getSort())) {
-      model.setSort("order_num");
-      model.setOrder("ASC");
-    }
-    List<LiStation> list = liStationService.queryPageByList(model);
-    return R.ok().put("page", getMyPage(list, model));
+    List<LiStation> list = liStationService.list(new LambdaQueryWrapper<LiStation>().eq(LiStation::getDeleted,0).orderByAsc(LiStation::getOrderNum));
+    List<LiStationMap> mapList = liStationMapService.getListByStationId(null);
+    return R.ok().put("list", list).put("mapList",mapList);
   }
 
   /**

microservice-admin/src/main/resources/mapper/liResource/LiStationMapMapper.xml

@@ -68,8 +68,9 @@
 
   <select id="getListByStationId" parameterType="Object" resultMap="BaseResultMap">
 		select * from li_station_map
-		where station_id = #{stationId} and deleted=0
-		order by order_num
+		where deleted=0
+        <if test="stationId!=null and stationId!=''">and station_id = #{stationId}</if>
+		order by station_id,order_num
 	</select>
     <select id="queryListByParam" resultType="java.util.Map">
       select lsm.id,lsm.name,ls.station_name as stationName