From 898bd4e44b8b0abe35cf98bf104aec44ec06dee2 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 22 四月 2025 20:57:59 +0800
Subject: [PATCH] bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 73 ++++++++++++++++--------------------
1 files changed, 33 insertions(+), 40 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 df36b68..b983253 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
@@ -137,12 +137,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));
}
//
@@ -164,7 +164,7 @@
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)
@@ -192,7 +192,7 @@
// us.setRemark(user.getRemark());
userService.updateUser(user);
//LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
- // 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));
}
@@ -258,29 +258,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
@@ -351,10 +351,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);
+ }
/**
* 鎵惧埌鎵�鏈夌殑鎴愬憳
@@ -388,16 +388,10 @@
public AjaxResult listGenealogy(Genealogy genealogy){
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);
-// System.out.println("11111111//"+clanId);
-
SysUser user = SecurityUtils.getLoginUser().getUser();
Integer clanId = user.getClanId();
- genealogy.setClanId(clanId);
+ if(clanId != null) genealogy.setClanId(clanId);
+ System.out.println("11111111//"+clanId);
return zInfoUserService.listGenealogy(genealogy,pageNum,pageSize);
}
@@ -429,7 +423,7 @@
/**
* 鍒嗕韩缁欏叾浠栧鏃忔暟鎹紝閫氳繃杈撳叆鍚嶅瓧鏌ユ壘鎵�鏈夌殑鍚屽悕鐢ㄦ埛鍜屽鏃忓彿
- */
+ */
@PostMapping("/byName")
public AjaxResult listByUserNameDate(@RequestBody SysUser sysUser)
{
@@ -443,5 +437,4 @@
return zInfoUserService.findUserNameAClan(strings1);
}
-}
-
+}
\ No newline at end of file
--
Gitblit v1.9.1