From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 103 ++++++++++++++++++++++++++++-----------------------
1 files changed, 57 insertions(+), 46 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 e4c1438..2941d4c 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
@@ -13,10 +13,8 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.domain.ShareMore;
-import com.ruoyi.domain.ZInfoUser;
-import com.ruoyi.domain.ZfDoctor;
-import com.ruoyi.domain.ZfRelation;
+import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.Genealogy;
import com.ruoyi.domain.dto.GenealogyExportDto;
@@ -137,12 +135,12 @@
}
@GetMapping("/{id}")
public AjaxResult getInfoById(@PathVariable("id") Long id) {
- // SysUser user = SecurityUtils.getLoginUser().getUser();
+ // SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = id;
//鏌ヨsys_user琛�
- // SysUser sysUser = sysUserService.selectUserById(userId);
+ // SysUser sysUser = sysUserService.selectUserById(userId);
return AjaxResult.success(zInfoUserService.getInfoById(userId));
}
//
@@ -163,8 +161,9 @@
LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
+
return toAjax(zInfoUserService.update(uw));
- // saveOrUpdate(zInfoUser));
+ // saveOrUpdate(zInfoUser));
}
@Log(title = "涓汉璇︾粏淇℃伅璁板綍", businessType = BusinessType.INSERT)
@@ -177,11 +176,19 @@
Long userId = user.getUserId();
zInfoUser.setSysId(userId);
-
-
+// ZInfoUser infoBysysId = zInfoUserService.getInfoBysysId(userId);
+//
+//
+// zInfoUser.setUserId(infoBysysId.getUserId());
user.setSex(zInfoUser.getSex()+"");
user.setUserName(zInfoUser.getOldName());
user.setPhonenumber(zInfoUser.getPhoneNumber());
+ String oriUaid = zInfoUser.getUaid();
+
+ String originalString = zInfoUser.getOldName()+"-"+zInfoUser.getPhoneNumber();
+ String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
+ zInfoUser.setUaid(uniqueId);
+
//
// us.setUserId(user.getSysId());
// us.setUserName(user.getUserName());
@@ -192,8 +199,18 @@
// us.setRemark(user.getRemark());
userService.updateUser(user);
//LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
- // uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
- return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
+
+
+ //淇敼uaid鐩稿悓鐨勭敤鎴疯褰�
+ if(oriUaid!=null) {
+ List<ZInfoUser> list = zInfoUserService.findByUaidToFaid(oriUaid);
+ for(ZInfoUser zInfoUser1: list)
+ zInfoUser1.setUaid(oriUaid);
+ return toAjax(zInfoUserService.saveBatch(list));
+ }
+ else
+ // uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
+ return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
// saveOrUpdate(zInfoUser));
}
@@ -258,29 +275,29 @@
* 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄瓙瀛� tpfid:鑷繁id 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄紓鎬� 涓嶆槸鏈鐨勪汉閫�
*/
@GetMapping("/uidAndUJd/{tpfid}/{sex}/{clanId}")
- public AjaxResult findByUidAndUid(@PathVariable("tpfid") Long tpfid, @PathVariable("sex") Integer sex, @PathVariable("clanId") Integer clanId)
- {
+ public AjaxResult findByUidAndUid(@PathVariable("tpfid") Long tpfid, @PathVariable("sex") Integer sex, @PathVariable("clanId") Integer clanId)
+ {
// Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
- //sex == 0 -> 鐢�
- if (sex == 1){
- sex = 0;
- }
- else if (sex == 0){
- sex = 1;
- }
- List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex, clanId);
- List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
- HashMap<Long,String> bs = new HashMap<>();
- for (ZInfoUser zInfoUser:zInfoUsers) {
- if (!zInfoUserService.findByuid(zInfoUser.getUserId(), tpfid) && (zInfoUser.getMaritalStatus() == null || zInfoUser.getMaritalStatus() != 1)){
- bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());
-
- }
-
- }
- satisfyIds.add(bs);
- return AjaxResult.success(satisfyIds);
+ //sex == 0 -> 鐢�
+ if (sex == 1){
+ sex = 0;
}
+ else if (sex == 0){
+ sex = 1;
+ }
+ List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex, clanId);
+ List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
+ HashMap<Long,String> bs = new HashMap<>();
+ for (ZInfoUser zInfoUser:zInfoUsers) {
+ if (!zInfoUserService.findByuid(zInfoUser.getUserId(), tpfid) && (zInfoUser.getMaritalStatus() == null || zInfoUser.getMaritalStatus() != 1)){
+ bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());
+
+ }
+
+ }
+ satisfyIds.add(bs);
+ return AjaxResult.success(satisfyIds);
+ }
/**
* 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄瓙瀛� uid:闀胯緢id,tpfid:鎴戣嚜宸辩殑zinfoid
@@ -305,9 +322,7 @@
List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
HashMap<Long,String> bs = new HashMap<>();
for (ZInfoUser zInfoUser:zInfoUsers) {
- if (zInfoUser.getMaritalStatus() ==null || zInfoUser.getMaritalStatus() != 1 )
bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());
-
}
satisfyIds.add(bs);
return AjaxResult.success(satisfyIds);
@@ -351,10 +366,10 @@
* 鏍规嵁瀹跺涵鎴愬憳鎵惧埌鎵�鏈変汉
*/
@GetMapping("/allFamInfo")
- public AjaxResult listAllFamilyPeople(@PathParam("clanId") Integer clanId)
- {
- return zInfoUserService.listAllFamilyPeople(clanId);
- }
+ public AjaxResult listAllFamilyPeople(@PathParam("clanId") Integer clanId)
+ {
+ return zInfoUserService.listAllFamilyPeople(clanId);
+ }
/**
* 鎵惧埌鎵�鏈夌殑鎴愬憳
@@ -389,12 +404,9 @@
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
SysUser user = SecurityUtils.getLoginUser().getUser();
- Long userId = user.getUserId();
- System.out.println("11111111//"+userId);
- Integer clanId=zInfoUserService.getInfoBysysId(userId).getClanId();
- genealogy.setClanId(clanId);
+ Integer clanId = user.getClanId();
+ if(clanId != null) genealogy.setClanId(clanId);
System.out.println("11111111//"+clanId);
-
return zInfoUserService.listGenealogy(genealogy,pageNum,pageSize);
}
@@ -426,7 +438,7 @@
/**
* 鍒嗕韩缁欏叾浠栧鏃忔暟鎹紝閫氳繃杈撳叆鍚嶅瓧鏌ユ壘鎵�鏈夌殑鍚屽悕鐢ㄦ埛鍜屽鏃忓彿
- */
+ */
@PostMapping("/byName")
public AjaxResult listByUserNameDate(@RequestBody SysUser sysUser)
{
@@ -440,5 +452,4 @@
return zInfoUserService.findUserNameAClan(strings1);
}
-}
-
+}
\ No newline at end of file
--
Gitblit v1.9.1