From 4c1aa5c03b32aaae0f88dfa3ea5dcef3419d4c86 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期五, 28 六月 2024 22:03:13 +0800
Subject: [PATCH] 继承家庭号&过滤配偶
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 3 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 56 +++++++++++++++++++---------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 41 +++++++++++++++++++-
3 files changed, 78 insertions(+), 22 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index a184b4b..b712b72 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -169,6 +169,26 @@
// infoUser.setFatherId(zfFamily.getFid());
// if(zfFamily!=null&&zfFamily.getMid()!=null)
// infoUser.setMomId(zfFamily.getMid());
+
+ if (user.getFid() != null){
+ ZInfoUser father = zInfoUserService.getById(user.getFid());
+ if (father.getIsMyFamily() == 1)
+ System.out.println("11111111111111111111111111111111/");
+ infoUser.setFamilyId(father.getFamilyId());
+ }
+ else if(user.getMid() != null){
+ ZInfoUser mother = zInfoUserService.getById(user.getMid());
+ if (mother.getIsMyFamily() == 1)
+ System.out.println("2222222222222222222222222222222222/");
+ infoUser.setFamilyId(mother.getFamilyId());
+ }
+// else if (user.getSpouseId()!=null) {
+// ZInfoUser spouse = zInfoUserService.getById(user.getSpouseId());
+// System.out.println("33333333333333333333333333333333333333333/");
+// infoUser.setFamilyId(spouse.getFamilyId());
+// infoUser.setSpouseId(user.getSpouseId());
+// }
+
zInfoUserService.saveOrUpdate(infoUser);
if(user.getSpouseId()!=null) {
ZInfoUser zu = new ZInfoUser();
@@ -201,6 +221,7 @@
user.setSex(userAll.getSex());
user.setRemark(userAll.getRemark());
user.setUpdateBy(userAll.getUpdateBy());
+// user.setSex(userAll.getSex()=="鐢�"?"1":"0");
// user.setPostIds(userAll.getPostIds());
// user.set
if (!userService.checkUserNameUnique(user))
@@ -228,7 +249,7 @@
infoUser.setOldName(userAll.getUserName());
infoUser.setPhoneNumber(userAll.getPhonenumber());
infoUser.setSex(userAll.getSex()=="鐢�"?1:0);
- infoUser.setFamilyId(userAll.getFid());
+// infoUser.setFamilyId(userAll.getFid());
infoUser.setSpouseId(userAll.getSpouseId());
infoUser.setFatherId(userAll.getFid());
@@ -243,8 +264,8 @@
// infoUser.setFatherId(zfFamily.getMid());
// // infoUser.setMomId(zfFamily.getMid());
// }
- System.out.println("-----");
- System.out.println(userAll.getIsMyFamily());
+// System.out.println("-----");
+// System.out.println(userAll.getIsMyFamily());
infoUser.setIsMyFamily(userAll.getIsMyFamily());
// if(userAll.getSpouseId()==0)
@@ -253,6 +274,19 @@
// infoUser.setSpouseId(userAll.getSpouseId());
//
// }
+ if (userAll.getFid() != null && userAll.getMid() != null){
+ ZInfoUser father = zInfoUserService.getById(userAll.getFid());
+ ZInfoUser mother = zInfoUserService.getById(userAll.getMid());
+ if (father.getIsMyFamily() == 1)
+ infoUser.setFamilyId(father.getFamilyId());
+ if (mother.getIsMyFamily() == 1)
+ infoUser.setFamilyId(mother.getFamilyId());
+ }
+// else {
+// ZInfoUser spouse = zInfoUserService.getById(userAll.getSpouseId());
+// infoUser.setFamilyId(spouse.getFamilyId());
+// }
+
//鍓嶇淇濊瘉浜嗚鑹蹭笉涓虹┖
// if(user.getRoleIds()[0]==102)
@@ -270,6 +304,7 @@
zInfoUserService.updateById(zu);
}
}
+
// zInfoUserService.saveOrUpdate(infoUser);
// LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
// lqw.eq(ZInfoUser::getSpouseId, userAll.getSpouseId());
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 c5e2f15..bbb6052 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
@@ -204,21 +204,12 @@
// return zInfoUserService.empower(empowerDto);
// }
/**
- * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄瓙瀛�(uid:杈堝垎楂樼殑id,tpfid:杈堝垎浣庣殑id)
+ * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄瓙瀛� tpfid:鑷繁id 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄紓鎬� 涓嶆槸鏈鐨勪汉閫�
*/
- @GetMapping("/uidAndUJd/{uid}/{tpfid}")
- public AjaxResult findByUidAndUid(@PathVariable("uid") Long uid,@PathVariable("tpfid") Long tpfid)
+ @GetMapping("/uidAndUJd/{tpfid}/{sex}")
+ public AjaxResult findByUidAndUid(@PathVariable("tpfid") Long tpfid, @PathVariable("sex") Integer sex)
{
- return AjaxResult.success(zInfoUserService.findByuid(uid, tpfid));
- }
- /**
- * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄紓鎬�
- */
-
- @GetMapping("/sex/{uid}/{tpfid}")
- public AjaxResult findBySex(@PathVariable("uid") Long uid,@PathVariable("tpfid") Long tpfid)
- {
- Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
+// Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
//sex == 0 -> 鐢�
if (sex == 1){
sex = 0;
@@ -227,15 +218,44 @@
sex = 1;
}
List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex);
- List<String> nickName = new ArrayList<>();
+ List<String> satisfyIds = new ArrayList<>();
for (ZInfoUser zInfoUser:zInfoUsers) {
- if (!zInfoUserService.findByuid(uid, tpfid)){
- nickName.add(zInfoUser.getNickName());
- }
+ if (zInfoUser.getIsMyFamily() == 1)
+ if (!zInfoUserService.findByuid(zInfoUser.getUserId(), tpfid)){
+ satisfyIds.add(zInfoUser.getNickName());
+ }
}
- return AjaxResult.success(nickName);
+ return AjaxResult.success(satisfyIds);
}
/**
+ * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄紓鎬�
+ */
+
+// /**
+// * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄瓙瀛�(uid:?,tpfid:鑷繁id) 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄紓鎬� 涓嶆槸鏈鐨勪汉閫�
+// */
+// @GetMapping("/uidAndUJd/{uid}/{tpfid}/{sex}")
+// public AjaxResult findByUidAndUid(@PathVariable("uid") Long uid,@PathVariable("tpfid") Long tpfid, @PathVariable("sex") Integer sex)
+// {
+//// 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);
+// List<String> nickName = new ArrayList<>();
+// for (ZInfoUser zInfoUser:zInfoUsers) {
+// if (!zInfoUserService.findByuid(uid, tpfid)){
+// if (zInfoUser.getIsMyFamily() == 1)
+// nickName.add(zInfoUser.getNickName());
+// }
+// }
+// return AjaxResult.success(nickName);
+// }
+ /**
* 瀹舵牴缃�
*/
@GetMapping("/root")
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index 5900b2c..fe666be 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -72,7 +72,7 @@
return false;
// System.out.println(tfid);
// System.out.println("00000000000---------------");
- ZInfoUser infu = this.getById(getInfoById(tfid));
+ ZInfoUser infu = this.getById(tfid);
if(infu==null)
return false;
if(infu.getFatherId()!=null && uid.equals(infu.getFatherId()))
@@ -93,6 +93,7 @@
return null;
}
+
@Override
public List<ZInfoUser> getDataBySex(Integer sex){
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
--
Gitblit v1.9.1