ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -6,6 +6,8 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.core.domain.entity.sysUserInfo; import com.ruoyi.domain.ZInfoUser; @@ -167,6 +169,7 @@ user.setCreateBy(getUsername()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); //写入到 新建立的信息表里面 ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId()); ZInfoUser infoUser = new ZInfoUser(); infoUser.setUserId(user.getUserId()); @@ -183,14 +186,30 @@ infoUser.setIsMyFamily(userAll.getIsMyFamily()); if(userAll.getSpouseId()==0) infoUser.setSpouseId(null); else else { infoUser.setSpouseId(userAll.getSpouseId()); } //前端保证了角色不为空 if(user.getRoleIds()[0]==102) infoUser.setRoleId(3L); // infoUser.setRoleName(user.g); if(userAll.getFamilyId()!=-1) { zInfoUserService.saveOrUpdate(infoUser); LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); lqw.eq(ZInfoUser::getSpouseId, userAll.getSpouseId()); List<ZInfoUser> lis = zInfoUserService.list(lqw); if(lis.size()>0) { // ZInfoUser zi = new ZInfoUser(); // zi.setUserId(userAll.getSpouseId()); // // UpdateWrapper wrapper = new UpdateWrapper(); // zi.setSpouseId(lis.get(0).getUserId()); // System.out.println(userAll.getSpouseId()); // System.out.println(lis.get(0).getUserId()); zInfoUserService.lambdaUpdate().eq(ZInfoUser::getUserId, userAll.getSpouseId()) .set(ZInfoUser::getSpouseId, lis.get(0).getUserId()) .update(); } } return toAjax(userService.insertUser(user)); } ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -270,6 +270,11 @@ return zInfoUserService.listGenealogy2(genealogy,pageNum,pageSize); } @GetMapping("/list/getInfoByfid/{fid}") public AjaxResult getInfoByfid(@PathVariable("fid") Long fid) { return zInfoUserService.getInfoByfid(fid); } } ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
@@ -47,7 +47,7 @@ @GetMapping("/type") public AjaxResult listType(){ return zfPropertyService.listType(); return zfPropertyService.selectType(); } /** zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
@@ -22,6 +22,8 @@ AjaxResult selectDataList(ZfProperty zfProperty,Integer pageNum,Integer pageSize); List<ZfProperty> selectByIds(Long[] ids); AjaxResult selectType(); List<ZfProperty> selectByFamilyIds(Long[] familyIds); AjaxResult addData(ZfProperty zfProperty);
@@ -22,6 +22,7 @@ AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize); AjaxResult getInfoByfid(Long fid); List<ZInfoUser> selectByCondition(ZInfoUser zInfoUser); AjaxResult removeByUserName(List userName); zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -1,6 +1,7 @@ package com.ruoyi.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; @@ -307,6 +308,12 @@ } @Override public AjaxResult selectType() { List<String> lis = list(new QueryWrapper<ZfProperty>().select("distinct (type)").lambda()).stream().map(ZfProperty::getType).collect(Collectors.toList()); return AjaxResult.success(lis); } @Override public List<ZfProperty> selectByFamilyIds(Long[] familyIds) { LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>(); lqw.in(ZfProperty::getFamilyId,familyIds); zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -70,6 +70,17 @@ } @Override public AjaxResult getInfoByfid(Long fid) { LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); lqw.eq(ZInfoUser::getFamilyId, fid); lqw.eq(ZInfoUser::getIsMyFamily, 1L); lqw.isNull(ZInfoUser::getSpouseId); List<ZInfoUser> list = list(lqw); return AjaxResult.success(list); } private LambdaQueryWrapper<ZInfoUser> buildCondition(ZInfoUser zInfoUser) { LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); @@ -366,7 +377,7 @@ // List<ZInfoUser> allPeopleList = list(); List<ZInfoUser> result = null; try { result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && (people.getFatherId() == 0 || people.getMomId() == 0)) result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && ((people.getFatherId()!=null&&people.getFatherId() == 0) || (people.getMomId()!=null&&people.getMomId() == 0))) .map(people -> { if (depth > 1) { people.setIdentity(1); @@ -714,7 +725,12 @@ @Override public AjaxResult listAllFamilyPeople() { List<ZInfoUser> collect = list().stream().filter(zInfoUser -> zInfoUser.getRoleId()== 3).collect(Collectors.toList()); // List<ZInfoUser> lis = list(); // for(ZInfoUser tm: lis) // { // System.out.println(tm.getRoleId()); // } List<ZInfoUser> collect = list().stream().filter(zInfoUser -> zInfoUser!=null&&zInfoUser.getRoleId()!=null&&zInfoUser.getRoleId()== 3).collect(Collectors.toList()); return AjaxResult.success(collect); }
