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()); 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) { 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); 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; 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); 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; }