From 4e8951a439c03e87568789cedeb62033884412db Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 16 五月 2023 10:24:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java
index f23ebd0..0894c4a 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java
@@ -175,6 +175,7 @@
EntityWrapper<TAppUser> wrapper = tAppUserService.getUserListWrapper(createTime,nickname,phone,id,status);
// 是否异常
wrapper.eq("is_exception",2);
+ wrapper.orderBy("createTime",false);
List<TAppUser> tAppUsers = tAppUserService.selectList(wrapper);
return tAppUserService.getTAppUserResp(tAppUsers);
@@ -194,6 +195,7 @@
Integer status) {
EntityWrapper<TAppUser> wrapper = tAppUserService.getUserListWrapper(createTime,nickname,phone,id,status);
wrapper.ne("is_exception",2);
+ wrapper.orderBy("createTime",false);
return tAppUserService.selectList(wrapper);
}
@@ -311,7 +313,7 @@
values[i][7] = d.getEmergencyContact();
values[i][8] = d.getEmergencyPhone();
values[i][9] = String.valueOf(d.getAccountBalance());
- values[i][10] = String.valueOf(d.getUserTagId());
+ values[i][10] = String.valueOf(Objects.nonNull(d.getUserTagId())?d.getUserTagId():"");
Integer status1 = d.getStatus();
if(1 == status1){
values[i][11] = "正常";
--
Gitblit v1.7.1