From 4c1aa5c03b32aaae0f88dfa3ea5dcef3419d4c86 Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期五, 28 六月 2024 22:03:13 +0800 Subject: [PATCH] 继承家庭号&过滤配偶 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 56 ++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 38 insertions(+), 18 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 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") -- Gitblit v1.9.1