修改相关权限

feige

2024-09-03 c8ea9050a3e82eba68617c1a85ebb8b93eb885a3

 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)