From ba97f97d28f65d2b8ed5406792aa66a9d3fc9ed8 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 29 十二月 2025 15:05:13 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-common/src/main/java/com/ruoyi/common/config/ElasticSearchConfig.java | 1 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 16 ++++++++++++----
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 7 +++++++
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index f6e6ceb..e7a7fd6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -158,6 +158,7 @@
ZInfoUser zInfoUser = zInfoUserService.getInfoById(userId);
if(zInfoUser!=null)
{
+ zInfoUser.setUpdateTime(zInfoUser.getUpdateTime()==null?zInfoUser.getCreateTime():zInfoUser.getUpdateTime());
return AjaxResult.success(zInfoUser);
}
else
@@ -171,7 +172,10 @@
//鏌ヨsys_user琛�
// SysUser sysUser = sysUserService.selectUserById(userId);
- return AjaxResult.success(zInfoUserService.getInfoById(userId));
+ ZInfoUser infoById = zInfoUserService.getInfoById(userId);
+ if (infoById != null) infoById.setUpdateTime(infoById.getUpdateTime()==null?infoById.getCreateTime():infoById.getUpdateTime());
+
+ return AjaxResult.success(infoById);
}
//
@@ -205,6 +209,7 @@
// if (!Pattern.matches("^[\\d]+(?:,[\\d]+)*$",zInfoUser.getFamilyId())) {
// throw new RuntimeException("璇疯緭鍏ュ彧鏈夋暟瀛楀拰鑻辨枃閫楀彿鐨勫瓧绗︿覆锛屼笖鏁板瓧鍜岄�楀彿蹇呴』浜ゆ浛鍑虹幇");
// }
+ Date currentDate = new Date();
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
zInfoUser.setSysId(userId);
@@ -222,11 +227,14 @@
user.setUserName(zInfoUser.getOldName());
user.setPhonenumber(zInfoUser.getPhoneNumber());
user.setEmail(zInfoUser.getEmail());
+ user.setUpdateTime(zInfoUser.getUpdateTime()!=null?zInfoUser.getUpdateTime():currentDate);
+
String oriUaid = zInfoUser.getUaid();
String originalString = zInfoUser.getOldName()+"-"+zInfoUser.getPhoneNumber();
String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
zInfoUser.setUaid(uniqueId);
+
//
// us.setUserId(user.getSysId());
@@ -273,7 +281,7 @@
return toAjax(zInfoUserService.updateBatchById(list));
}
else
- // uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
+ // uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
// saveOrUpdate(zInfoUser));
}
@@ -386,7 +394,7 @@
List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
HashMap<Long,String> bs = new HashMap<>();
for (ZInfoUser zInfoUser:zInfoUsers) {
- bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());
+ bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());
}
satisfyIds.add(bs);
return AjaxResult.success(satisfyIds);
@@ -516,4 +524,4 @@
return zInfoUserService.findUserNameAClan(strings1);
}
-}
\ No newline at end of file
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/ElasticSearchConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/ElasticSearchConfig.java
index 5bd6098..f04dcae 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/ElasticSearchConfig.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/ElasticSearchConfig.java
@@ -36,6 +36,7 @@
"localhost",
8087,
"http"
+
)
));
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
index a502e22..89b9f98 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -253,4 +253,11 @@
*/
@TableField(exist = false)
private List<ZInfoUser> childList;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+ private Date updateTime;
+
}
--
Gitblit v1.9.1