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-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 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 737459e..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
@@ -75,6 +75,35 @@
/**
+ * 鏍规嵁鐢ㄦ埛鐨刬d鏌ヨ鍙﹀涓�涓鏃忕殑鍏ㄩ儴鎴愬憳淇℃伅
+ *
+ */
+ @GetMapping("/getAnotherFamInfo/{userId}")
+ public AjaxResult getAnotherFamInfo(@PathVariable("userId") Long userId)
+ {
+ ZInfoUser zInfoUser = new ZInfoUser();
+ zInfoUser.setSysId(userId);
+ System.out.println(userId);
+ List<ZInfoUser> zInfoUsers = zInfoUserService.selectByCondition(zInfoUser);
+ if(!zInfoUsers.isEmpty())
+ {
+
+ ZInfoUser zi = new ZInfoUser();
+ zi.setUaid(zInfoUsers.get(0).getUaid());
+ zi.setSysId(userId);
+
+ ZInfoUser zss = zInfoUserService.selectByUaidAndUid(zi);
+
+ return zInfoUserService.listAllFamilyPeople(zss.getClanId());
+ // return AjaxResult.success("鏌ヨ鎴愬姛",zss);
+ }
+ else
+ {
+ return AjaxResult.success("娌℃湁鍙﹀鐨勫鏃忎俊鎭�", null);
+ }
+ }
+
+ /**
* 瀵煎嚭涓汉璇︾粏淇℃伅璁板綍鍒楄〃
*/
// @PreAuthorize("@ss.hasPermi('system:property:export')")
@@ -252,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));
}
@@ -365,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);
--
Gitblit v1.9.1