From 65f0459e8c347e8e2e2492c9d45b299c1a993530 Mon Sep 17 00:00:00 2001
From: zhihao <18915542763@163.com>
Date: Mon, 15 Jun 2026 15:56:21 +0800
Subject: [PATCH] =?UTF-8?q?czh-20250615-=E9=80=89=E4=BA=BA=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/modules/system/entity/SysUser.java    | 12 ++++++++++++
 .../system/mapper/xml/SysUserDepartMapper.xml       |  1 +
 .../service/impl/SysUserDepartServiceImpl.java      | 13 +++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
index 4ccab62..03e2711 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
@@ -225,4 +225,16 @@ public class SysUser implements Serializable {
     @Dict(dicCode = "is_special")
     private Integer isSpecial;
 
+    /**
+     * 排序号
+     */
+    @Excel(name = "排序号", width = 15)
+    private Integer sortno;
+
+    /**
+     * 用户IP
+     */
+    @Excel(name = "用户IP", width = 15)
+    private String ip;
+
 }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml
index 67cb93e..fb1c568 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml
@@ -37,6 +37,7 @@
 		    <bind name="bindRealname" value="'%'+realname+'%'"/>
 			and a.realname like #{bindRealname}
 		</if>
+		order by a.sortno ASC
 	</select>
 
 	<!-- 根据部门查询部门用户 分页 -->
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
index 7a9f33d..cf3f1e2 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
@@ -191,6 +191,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
             //update-begin---author:wangshuai ---date:20220902  for：[VUEN-2121]临时用户不能直接显示------------
             query.ne(SysUser::getUsername,"_reserve_user_external");
             //update-end---author:wangshuai ---date:20220902  for：[VUEN-2121]临时用户不能直接显示------------
+            query.orderByAsc(SysUser::getSortno);
 
 			//------------------------------------------------------------------------------------------------
 			//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
@@ -241,6 +242,18 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
 			// 重新设置到分页对象
 			pageList.setRecords(filteredUsers);
 		}
+            // sortno升序排列
+            List<SysUser> records = pageList.getRecords();
+            if (records != null && records.size() > 0) {
+                records.sort((u1, u2) -> {
+                    Integer s1 = u1.getSortno();
+                    Integer s2 = u2.getSortno();
+                    if (s1 == null && s2 == null) return 0;
+                    if (s1 == null) return 1;
+                    if (s2 == null) return -1;
+                    return s1 - s2;
+                });
+            }
 		return pageList;
 	}