From 3ce299ce3e9db1342b519dd8d8b9062c7f99eeea Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 30 八月 2024 20:03:17 +0800
Subject: [PATCH] 修改了登录的代码1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 b2ba6e9..8015c54 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
@@ -205,8 +205,8 @@
/**
* 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄瓙瀛� tpfid:鑷繁id 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄紓鎬� 涓嶆槸鏈鐨勪汉閫�
*/
- @GetMapping("/uidAndUJd/{tpfid}/{sex}")
- public AjaxResult findByUidAndUid(@PathVariable("tpfid") Long tpfid, @PathVariable("sex") Integer sex)
+ @GetMapping("/uidAndUJd/{tpfid}/{sex}/{clanId}")
+ public AjaxResult findByUidAndUid(@PathVariable("tpfid") Long tpfid, @PathVariable("sex") Integer sex, @PathVariable("clanId") Integer clanId)
{
// Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
//sex == 0 -> 鐢�
@@ -216,7 +216,7 @@
else if (sex == 0){
sex = 1;
}
- List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex);
+ List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex, clanId);
List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
HashMap<Long,String> bs = new HashMap<>();
for (ZInfoUser zInfoUser:zInfoUsers) {
@@ -238,8 +238,8 @@
return AjaxResult.success( zInfoUserService.findByuid(uid,tpfid));
}
- @GetMapping("/sex/{sex}")
- public AjaxResult findBySex(@PathVariable("sex") Integer sex)
+ @GetMapping("/sex/{sex}/{clanId}")
+ public AjaxResult findBySex(@PathVariable("sex") Integer sex, @PathVariable("clanId") Integer clanId)
{
// Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
//sex == 0 -> 鐢�
@@ -249,7 +249,7 @@
else if (sex == 0){
sex = 1;
}
- List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex);
+ List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex, clanId);
List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
HashMap<Long,String> bs = new HashMap<>();
for (ZInfoUser zInfoUser:zInfoUsers) {
--
Gitblit v1.9.1