From b486873000ea043f159c8de5c0edb123c0f38a87 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 09 Jun 2026 08:36:34 +0800
Subject: [PATCH] refactor(flyer): 修改飞手表单和实体类中的擅长任务类型字段

---
 drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml
index 7343b98..0a8129c 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml
@@ -55,7 +55,7 @@
             and u.user_type = #{user.userType}
         </if>
         <if test="user.sysType!=null and user.sysType != ''">
-            and r.sys_type = #{user.sysType}
+            and (u.sys_type = #{user.sysType} or u.sys_type  = '0')
         </if>
         <if test="deptIdList!=null and deptIdList.size>0">
             and u.id in (
@@ -71,7 +71,7 @@
             )
         </if>
         GROUP BY u.id
-        ORDER BY u.id
+        ORDER BY u.create_time DESC
     </select>
 
     <select id="getUser" resultMap="userResultMap">

--
Gitblit v1.9.3