Browse Source

fix:修复房间排序错乱

黄渊昊 1 day ago
parent
commit
4dbe957540

+ 3 - 3
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/mapper/mapping/MonitorTargetMapper.xml

@@ -27,12 +27,12 @@
         <if test="type != null and type.trim() != ''">
         <if test="type != null and type.trim() != ''">
             <if test="name != null and name.trim() != '' and searchFlag == null">
             <if test="name != null and name.trim() != '' and searchFlag == null">
                 AND (
                 AND (
-                t.name LIKE CONCAT('%', #{param.name}, '%')
-                OR r.name LIKE CONCAT('%', #{param.name}, '%')
+                t.name LIKE CONCAT('%', #{name}, '%')
+                OR r.name LIKE CONCAT('%', #{name}, '%')
                 )
                 )
             </if>
             </if>
             <if test="name != null and name.trim() != '' and searchFlag != null">
             <if test="name != null and name.trim() != '' and searchFlag != null">
-                AND  r.sensor_code LIKE CONCAT('%', #{param.name}, '%')
+                AND  r.sensor_code LIKE CONCAT('%', #{name}, '%')
             </if>
             </if>
         </if>
         </if>
         GROUP BY t.status
         GROUP BY t.status

+ 1 - 1
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/targetroom/service/impl/TargetRoomServiceImpl.java

@@ -66,7 +66,7 @@ public class TargetRoomServiceImpl extends ServiceImpl<TargetRoomMapper, TargetR
             queryWrapper.orderBy(true, targetRoomPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
             queryWrapper.orderBy(true, targetRoomPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(targetRoomPageParam.getSortField()));
                     StrUtil.toUnderlineCase(targetRoomPageParam.getSortField()));
         } else {
         } else {
-            queryWrapper.lambda().orderByAsc(TargetRoom::getSortCode);
+            queryWrapper.lambda().orderByAsc(TargetRoom::getSortCode).orderByAsc(TargetRoom::getId);
         }
         }
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
     }