From 502a46d9f79f3a2e6ba8bf8c90b71c0c8ebf4815 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 13 Jun 2024 09:24:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml
index cc335f4..160d2b8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml
@@ -67,7 +67,7 @@
<if test="vo.endTime!=null and vo.endTime!=''">
and tb."check_date" <= #{vo.endTime}
</if>
- order by city_code,county_code asc
+ order by CAST(city_code AS number) asc,CAST(county_code AS number) asc,CAST(guid AS number) desc
</select>
<resultMap id="dto" type="cn.gistack.sm.sjztmd.dto.TbProjectDTO">
--
Gitblit v1.9.3