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-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 3 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 12 ++++++------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 2 +-
6 files changed, 12 insertions(+), 11 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 a63d213..6b5348b 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
@@ -286,7 +286,7 @@
infoUser.setNickName(userAll.getNickName());
infoUser.setOldName(userAll.getUserName());
infoUser.setPhoneNumber(userAll.getPhonenumber());
- infoUser.setSex(userAll.getSex()=="鐢�"?1:0);
+ infoUser.setSex(userAll.getSex()=="0"?0:1);
// infoUser.setFamilyId(userAll.getFid());
infoUser.setSpouseId(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 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) {
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
index 622d5f7..22db3a7 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
@@ -36,7 +36,7 @@
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
{
- SysUser user = userService.selectUserByUserName(username);
+ SysUser user = userService.selectUserByNickName(username);
if (StringUtils.isNull(user))
{
log.info("鐧诲綍鐢ㄦ埛锛歿} 涓嶅瓨鍦�.", username);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index fefba78..1b9b534 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -207,7 +207,7 @@
@Override
public boolean checkNickNameUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
- SysUser info = userMapper.checkUserNameUnique(user.getUserName());
+ SysUser info = userMapper.checkNickNameUnique(user.getNickName());
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
{
return UserConstants.NOT_UNIQUE;
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
index d9f78bd..48db369 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -26,7 +26,7 @@
List<ZInfoUser> selectByClanId(Integer clanId);
- List<ZInfoUser> getDataBySex(Integer sex);
+ List<ZInfoUser> getDataBySex(Integer sex,Integer clanId);
public ZInfoUser getInfoBysysId(Long sysid);
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 0e3a51b..c7947df 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
@@ -103,9 +103,10 @@
@Override
- public List<ZInfoUser> getDataBySex(Integer sex){
+ public List<ZInfoUser> getDataBySex(Integer sex, Integer clanId){
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZInfoUser::getSex, sex);
+ lqw.eq(ZInfoUser::getClanId, clanId);
List<ZInfoUser> list = list(lqw);
return list;
}
--
Gitblit v1.9.1