ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -20,6 +20,7 @@ import com.ruoyi.service.ZInfoUserService; import com.ruoyi.service.ZfFamilyService; import com.ruoyi.service.ZfRoleService; import com.ruoyi.system.mapper.SysUserMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -27,6 +28,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.websocket.server.PathParam; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -56,6 +58,9 @@ @Resource private ZfRoleService zfRoleService; @Resource private SysUserMapper sysUserMapper; // @GetMapping("/all") // public AjaxResult listAll(ZInfoUser zInfoUser){ @@ -199,7 +204,7 @@ // return zInfoUserService.empower(empowerDto); // } /** * 根据用户id判断是否是子孙 * 根据用户id判断是否是子孙(uid:辈分高的id,tpfid:辈分低的id) */ @GetMapping("/uidAndUJd/{uid}/{tpfid}") public AjaxResult findByUidAndUid(@PathVariable("uid") Long uid,@PathVariable("tpfid") Long tpfid) @@ -207,6 +212,30 @@ 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(); //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)){ nickName.add(zInfoUser.getNickName()); } } return AjaxResult.success(nickName); } /** * 家根网 */ @GetMapping("/root") zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -23,6 +23,8 @@ AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize); Boolean findByuid(Long uid, Long tfid); List<ZInfoUser> getDataBySex(Integer sex); public ZInfoUser getInfoBysysId(Long sysid); AjaxResult getInfoByfid(Long fid);
@@ -72,12 +72,12 @@ return false; // System.out.println(tfid); // System.out.println("00000000000---------------"); ZInfoUser infu = this.getById(tfid); ZInfoUser infu = this.getById(getInfoById(tfid)); if(infu==null) return false; if(infu.getFatherId()!=null && uid==infu.getFatherId()) if(infu.getFatherId()!=null && uid.equals(infu.getFatherId())) return true; if(infu.getMomId()!=null && uid==infu.getMomId()) if(infu.getMomId()!=null && uid.equals(infu.getMomId())) return true; return findByuid(uid, infu.getFatherId()) || findByuid(uid, infu.getMomId()); } @@ -91,6 +91,14 @@ return list.get(0); else return null; } @Override public List<ZInfoUser> getDataBySex(Integer sex){ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); lqw.eq(ZInfoUser::getSex, sex); List<ZInfoUser> list = list(lqw); return list; } @Override @@ -653,7 +661,7 @@ String roleName = zfRoleService.getById(user.getRoleId()).getName(); user.setRoleName(roleName); System.out.println("dddddddddddddddddddd"); // System.out.println("dddddddddddddddddddd"); // System.out.println(familyId); // if(familyId!=null&&familyId!=-1) // { zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorDownloadServiceImpl.java
@@ -31,9 +31,6 @@ ZfDoctorShareService zfDoctorShareService; @Resource ZfDoctorService zfDoctorService; @Resource ZInfoUserService zInfoUserService; @Resource @@ -64,6 +61,7 @@ @Override public AjaxResult addData(ZfDoctorDownload zfDoctorDownload) { zfDoctorDownload.setDownloadId(getUserId()); LambdaQueryWrapper<ZfDoctorDownload> lqw = uniqueCondition(zfDoctorDownload); List<ZfDoctorDownload> list = list(lqw); if (list.size() > 0) {
