ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -168,8 +168,11 @@ // System.out.println(user.getFamilyId()); // System.out.println("[[[[]]]]]]"); Long userId = user.getSysId(); SysUserRole sysUserRole=sysUserRoleMapper.selectUserById(userId); if (sysUserRole.getRoleId() == 102){ // SysUserRole sysUserRole=sysUserRoleMapper.selectUserById(userId); //System.out.println(sysUserRole.getRoleId()); System.out.println("你好呀"); System.out.println(user.getRoleId()); if (user.getRoleId().equals(102L)){ ZInfoUser infoUser = new ZInfoUser(); infoUser.setUserId(user.getUserId()); infoUser.setOldName(user.getUserName()); @@ -192,13 +195,25 @@ // infoUser.setMomId(zfFamily.getMid()); if (user.getFid() != null){ if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){ //跟随父亲的家族和家庭信息 // if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){ ZInfoUser father = zInfoUserService.getById(user.getFid()); System.out.println("11111111111111111111111111111111/"); infoUser.setFamilyId(father.getFamilyId()); infoUser.setClanId(father.getClanId()); }} // } } if(user.getMid()!=null) { //跟随母亲的家族和家庭信息 // if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){ ZInfoUser mother = zInfoUserService.getById(user.getMid()); System.out.println("11111111111111111111111111111111/"); infoUser.setFamilyId(mother.getFamilyId()); infoUser.setClanId(mother.getClanId()); } // else if(user.getMid() != null){ // ZInfoUser mother = zInfoUserService.getById(user.getMid()); // if (mother.getIsMyFamily() == 1) @@ -207,6 +222,8 @@ // } if (user.getSpouseId() != null){ if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){ //是本家 if (zInfoUserService.getById(user.getUserId()).getIsMyFamily() == 0) { ZInfoUser spouse = zInfoUserService.getById(user.getSpouseId()); System.out.println("33333333333333333333333333333333333333333/"); @@ -214,18 +231,30 @@ infoUser.setClanId(spouse.getClanId()); } }} zInfoUserService.saveOrUpdate(infoUser); if(infoUser.getFamilyId()!=null) zInfoUserService.saveOrUpdate(infoUser); else { System.out.println("家庭成员不能修改为普通用户"); return AjaxResult.success("家庭成员不能修改为普通用户"); } //更新配偶信息 if(user.getSpouseId()!=null) { ZInfoUser zu = new ZInfoUser(); zu.setUserId(user.getSpouseId()); zu.setSpouseId(infoUser.getUserId()); zInfoUserService.updateById(zu); }} } return AjaxResult.success(); } else { System.out.println("daniuni"); return AjaxResult.success("家庭成员不能修改为普通用户"); } // zInfoUserService.update(infoUser); // .saveOrUpdate(infoUser); return AjaxResult.success(); } /** * 新增用户 @@ -342,7 +371,7 @@ // if(userAll.getFamilyId()!=-1) { if(userAll.getRoleId()==102) { if(userAll.getRoleId().equals(102L)) { infoUser.setRoleId(3L); zInfoUserService.save(infoUser); if(userAll.getSpouseId()!=null) ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventShareController.java
@@ -6,6 +6,7 @@ import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.domain.ShareMore; import com.ruoyi.domain.ZfDownload; import com.ruoyi.service.ZIdeaShareService; import com.ruoyi.service.ZfEventDownloadService; import com.ruoyi.service.ZfEventShareService; import org.springframework.web.bind.annotation.*; @@ -24,6 +25,19 @@ @Resource ZfEventDownloadService zfEventDownloadService; @Resource ZIdeaShareService zIdeaShareService; @GetMapping("/shareUser/{userId}/{menuId}") public AjaxResult selectUserShareInfo(@PathVariable Integer userId, @PathVariable Long menuId){ return zIdeaShareService.selectShareUserInfo(userId, menuId); } /** * * @param zfDoctor * @return */ @PostMapping("/share") public AjaxResult share(@RequestBody ShareMore zfDoctor){ zfDoctor.setSysMenuId(2013L); zhang-content/src/main/java/com/ruoyi/mapper/ZfShareMapper.java
@@ -1,9 +1,23 @@ package com.ruoyi.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.domain.ZInfoUser; import com.ruoyi.domain.ZfShare; import com.ruoyi.domain.dto.AncestorClan; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @Mapper public interface ZfShareMapper extends BaseMapper<ZfShare> { @Select("select distinct(a.user_id),a.old_name from z_info_user a, zf_share b where b.share_id=a.user_id and b.user_id=#{user_id} and b.sys_menu_id=#{sys_menu_id}") List<ZInfoUser> selectShareInfo( @Param("user_id")Integer user_id, @Param("sys_menu_id") Long sys_menu_id); } zhang-content/src/main/java/com/ruoyi/service/ZIdeaShareService.java
@@ -22,4 +22,7 @@ AjaxResult listUserId(Integer pageNo ,Integer pageSize); Long getShareId(ZfDownload zfDownload); AjaxResult selectShareUserInfo(Integer user_id, Long menuId); } zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaShareServiceImpl.java
@@ -30,6 +30,8 @@ ZIdeaService zIdeaService; @Resource private ZfShareMapper zfShareMapper; @Resource private ZInfoUserService zInfoUserService; private LambdaQueryWrapper<ZfShare> uniqueCondition(ZfShare zfShare) { @@ -188,6 +190,12 @@ } } @Override public AjaxResult selectShareUserInfo(Integer user_id, Long menuId) { List<ZInfoUser> zInfoUsers = zfShareMapper.selectShareInfo(user_id, menuId); return AjaxResult.success(zInfoUsers); } } zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -681,7 +681,8 @@ { Long familyId = user.getFamilyId(); // System.out.println("dddddddddddddddddddd"); if(user.getRoleId()==null) user.setRoleId(3L); String roleName = zfRoleService.getById(user.getRoleId()).getName(); user.setRoleName(roleName);
