修改了权限的代码

feige

2024-06-16 3ad8fb4e7cc1391e8090f3da6ffa9c48690a12a3

修改了权限的代码

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -143,26 +143,30 @@
    {
        SysUser us = new SysUser();
        us.setUserId(user.getSysId());
        us.setUserName(user.getUserName());
        us.setNickName(user.getNickName());
        us.setRoleId(user.getRoleId());
        us.setSex(user.getSex());
        us.setStatus(user.getStatus());
        userService.updateUser(us);

        System.out.println(user.getFamilyId());
  //      System.out.println(user.getFamilyId());
     //   System.out.println("[[[[]]]]]]");
                ZInfoUser infoUser = new ZInfoUser();
        infoUser.setUserId(user.getUserId());
        infoUser.setOldName(user.getUserName());
        infoUser.setIsMyFamily(user.getIsMyFamily());
        infoUser.setFamilyId(user.getFamilyId());
        infoUser.setMomId(user.getMid());
        infoUser.setFatherId(user.getFid());
//        infoUser.setFamilyId(user.getFamilyId());
        infoUser.setSysId(user.getSysId());
        if(user.getSpouseId()!=null)
            infoUser.setSpouseId(user.getSpouseId());
        ZfFamily zfFamily = zfFamilyService.getByFamId(user.getFamilyId());
        if(zfFamily!=null&&zfFamily.getFid()!=null)
            infoUser.setFatherId(zfFamily.getFid());
        if(zfFamily!=null&&zfFamily.getMid()!=null)
            infoUser.setMomId(zfFamily.getMid());
//        ZfFamily zfFamily = zfFamilyService.getByFamId(user.getFamilyId());
//        if(zfFamily!=null&&zfFamily.getFid()!=null)
//            infoUser.setFatherId(zfFamily.getFid());
//        if(zfFamily!=null&&zfFamily.getMid()!=null)
//            infoUser.setMomId(zfFamily.getMid());
        zInfoUserService.saveOrUpdate(infoUser);
      //  zInfoUserService.update(infoUser);
             //   .saveOrUpdate(infoUser);
@@ -174,12 +178,12 @@
    @PreAuthorize("@ss.hasPermi('system:user:add')")
    @Log(title = "用户管理", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@Validated @RequestBody sysUserInfo userAll)
    public AjaxResult add(@Validated @RequestBody sysUserAndUserInfo userAll)
    {
        SysUser user = new SysUser();
        user.setUserId(userAll.getUserId());
      //  user.setUserId(userAll.getUserId());
        user.setAvatar(userAll.getAvatar());
        user.setPassword(userAll.getPassword());
        user.setPassword("123456");
        user.setNickName(userAll.getNickName());
        user.setUserName(userAll.getUserName());
        user.setPhonenumber(userAll.getPhonenumber());
@@ -189,7 +193,7 @@
        user.setSex(userAll.getSex());
        user.setRemark(userAll.getRemark());
        user.setUpdateBy(userAll.getUpdateBy());
        user.setPostIds(userAll.getPostIds());
    //    user.setPostIds(userAll.getPostIds());
      //  user.set
        if (!userService.checkUserNameUnique(user))
        {
@@ -207,56 +211,65 @@
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        userService.insertUser(user);
        //写入到 新建立的信息表里面

        ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId());
//
//        ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId());
        ZInfoUser infoUser = new ZInfoUser();
        infoUser.setSysId(user.getUserId());
     //   infoUser.setUserId(user.getUserId());
        infoUser.setNickName(user.getNickName());
        infoUser.setPhoneNumber(user.getPhonenumber());
        infoUser.setSex(user.getSex()=="男"?1:0);
        infoUser.setFamilyId(userAll.getFamilyId());
        if(zfFamily!=null&&zfFamily.getFid()!=null) {
            infoUser.setFatherId(zfFamily.getFid());
         //   infoUser.setMomId(zfFamily.getMid());
        }
        if(zfFamily!=null&&zfFamily.getMid()!=null) {
            infoUser.setFatherId(zfFamily.getMid());
            //   infoUser.setMomId(zfFamily.getMid());
        }
        infoUser.setNickName(userAll.getNickName());
        infoUser.setOldName(userAll.getUserName());
        infoUser.setPhoneNumber(userAll.getPhonenumber());
        infoUser.setSex(userAll.getSex()=="男"?1:0);
        infoUser.setFamilyId(userAll.getFid());
        infoUser.setSpouseId(userAll.getSpouseId());
        infoUser.setFatherId(userAll.getFid());
        infoUser.setMomId(userAll.getMid());
     //   infoUser.setFamilyId(userAll.getFamilyId());

//        if(zfFamily!=null&&zfFamily.getFid()!=null) {
//            infoUser.setFatherId(zfFamily.getFid());
//         //   infoUser.setMomId(zfFamily.getMid());
//        }
//        if(zfFamily!=null&&zfFamily.getMid()!=null) {
//            infoUser.setFatherId(zfFamily.getMid());
//            //   infoUser.setMomId(zfFamily.getMid());
//        }
        System.out.println("-----");
        System.out.println(userAll.getIsMyFamily());
        System.out.println(userAll.getFamilyId());
        infoUser.setIsMyFamily(userAll.getIsMyFamily());
        if(userAll.getSpouseId()==0)
            infoUser.setSpouseId(null);
        else {
            infoUser.setSpouseId(userAll.getSpouseId());

        }
        infoUser.setIsMyFamily(userAll.getIsMyFamily());
//        if(userAll.getSpouseId()==0)
//            infoUser.setSpouseId(null);
//        else {
//            infoUser.setSpouseId(userAll.getSpouseId());
//
//        }
        //前端保证了角色不为空
        if(user.getRoleIds()[0]==102)
            infoUser.setRoleId(3L);
     //   if(user.getRoleIds()[0]==102)

        // infoUser.setRoleName(user.g);

        if(userAll.getFamilyId()!=-1) {
      //  if(userAll.getFamilyId()!=-1) {
        if(userAll.getRoleId()==102) {
            infoUser.setRoleId(3L);
            zInfoUserService.save(infoUser);
        //    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();
            }
        }
        //    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 AjaxResult.success();
    }


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java

@@ -198,7 +198,14 @@
//
//        return zInfoUserService.empower(empowerDto);
//    }

    /**
     * 根据用户id判断是否是子孙
     */
    @GetMapping("/uidAndUJd/{uid}/{tpfid}")
        public AjaxResult findByUidAndUid(@PathVariable("uid")  Long uid,@PathVariable("tpfid")  Long tpfid)
        {
            return AjaxResult.success(zInfoUserService.findByuid(uid, tpfid));
        }
    /**
     * 家根网
     */

 zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java

@@ -21,7 +21,6 @@
 */
@TableName("z_info_user")
@Data
@ToString
public class ZInfoUser implements Serializable {

    private static final long serialVersionUID = 1L;

 zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java

@@ -2,27 +2,43 @@

import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excels;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

@Data
public class sysUserAndUserInfo {
public class sysUserAndUserInfo extends BaseEntity {
    private static final long serialVersionUID = 1L;


    private Long userId;

    @Excel(name = "手机号码")
    private String phonenumber;



    /** 用户头像 */
    private String avatar;

    /** 密码 */
    private String password;

    /** 用户昵称 */
    @Excel(name = "用户昵称")
    private String nickName;




    /** 用户昵称 */
    @Excel(name = "用户名称")
    private String nickName;


    private String userName;

    /** 用户性别 */
    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
@@ -52,7 +68,8 @@

    private Long spouseId;

    private Long familyId;
    private Long fid;

    private Long mid;
    private Long sysId;
}

 zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java

@@ -21,8 +21,7 @@
public interface ZInfoUserService extends IService<ZInfoUser> {

    AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);


 Boolean findByuid(Long uid, Long tfid);

 public ZInfoUser getInfoBysysId(Long sysid);
    AjaxResult getInfoByfid(Long fid);

 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java

@@ -65,6 +65,24 @@
    }

    @Override
    public Boolean findByuid(Long uid, Long tfid) {


        if(uid==null)
            return false;
     //   System.out.println(tfid);
     //   System.out.println("00000000000---------------");
        ZInfoUser infu = this.getById(tfid);
        if(infu==null)
            return false;
        if(infu.getFatherId()!=null && uid==infu.getFatherId())
            return true;
        if(infu.getMomId()!=null && uid==infu.getMomId())
            return true;
        return findByuid(uid, infu.getFatherId()) || findByuid(uid, infu.getMomId());
    }

    @Override
    public ZInfoUser getInfoBysysId(Long sysid) {
        LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZInfoUser::getSysId, sysid);
@@ -362,7 +380,8 @@
                    return people;
                }).collect(Collectors.toList());

//System.out.println("--------------++++++++++++++++--------------");
System.out.println("--------------++++++++++++++++--------------");
System.out.println(result); 
        return AjaxResult.success(result);

    }
@@ -635,12 +654,12 @@

            user.setRoleName(roleName);
            System.out.println("dddddddddddddddddddd");
            System.out.println(familyId);
            if(familyId!=null||familyId!=-1)
            {
                String familyName = zfFamilyService.getById(familyId).getName();
                user.setFamilyName(familyName);
            }
//            System.out.println(familyId);
//            if(familyId!=null&&familyId!=-1)
//            {
//                String familyName = zfFamilyService.getById(familyId).getName();
//                user.setFamilyName(familyName);
//            }
        }
        return user;
    }
@@ -781,10 +800,13 @@
//        ).collect(Collectors.toList());

        List<ZInfoUser> collect = allPeopleList.stream().filter(
                one -> ((one.getFamilyId()!=null && one.getFatherId() == people.getUserId()) || (one.getMomId()!=null&&one.getMomId() == people.getUserId())) && (people.getIsMyFamily() == 1)

                one -> (((one.getFamilyId()!=null && Objects.equals(one.getFatherId(), people.getUserId())) || (one.getMomId()!=null&& one.getMomId().equals(people.getUserId()))) && (one.getIsMyFamily() == 1))
        ).map(
                one -> {
                    if (depth == 1) {
                    System.out.println("++++++++++----0009999");
                    System.out.println(one);
                    if (depth == 0) {
                        one.setIdentity(people.getIdentity() + 1);
                        //根据配偶id查询配偶的数据，封装好一起返回
                        Long spouseId = one.getSpouseId();