修改权限相关

feige

2024-08-22 5e2ebcceae4bc34b46370f2c10110cd72e7f4fba

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

@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -17,6 +18,9 @@
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfAncestorService;
import com.ruoyi.service.ZfFamilyService;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -73,6 +77,9 @@

    @Resource
    private ZfAncestorService zfAncestorService;

    @Resource
    private SysUserRoleMapper sysUserRoleMapper;
    /**
     * 获取用户列表
     */
@@ -81,6 +88,8 @@
    public TableDataInfo list(SysUser user)
    {
        startPage();
        System.out.println(user.getClanId());
        System.out.println("----------------++++++++++++==0------------");
        List<SysUser> list = userService.selectUserList(user);
        return getDataTable(list);
    }
@@ -121,7 +130,7 @@
    @GetMapping(value = { "/", "/{userId}" })
    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
    {
        userService.checkUserDataScope(userId);
      //  userService.checkUserDataScope(userId);
        AjaxResult ajax = AjaxResult.success();
        List<SysRole> roles = roleService.selectRoleAll();
        //如果是admin则直接返回所有的角色，否则就返回不是管理员的角色信息
@@ -158,6 +167,9 @@

  //      System.out.println(user.getFamilyId());
     //   System.out.println("[[[[]]]]]]");
        Long userId = user.getSysId();
        SysUserRole sysUserRole=sysUserRoleMapper.selectUserById(userId);
        if (sysUserRole.getRoleId() == 102){
        ZInfoUser infoUser = new ZInfoUser();
        infoUser.setUserId(user.getUserId());
        infoUser.setOldName(user.getUserName());
@@ -168,6 +180,8 @@
        infoUser.setSex(Integer.valueOf(user.getSex()));
//        infoUser.setFamilyId(user.getFamilyId());
        infoUser.setSysId(user.getSysId());


        if(user.getSpouseId()!=null) {
            infoUser.setSpouseId(user.getSpouseId());
        }
@@ -207,7 +221,7 @@
            zu.setUserId(user.getSpouseId());
            zu.setSpouseId(infoUser.getUserId());
            zInfoUserService.updateById(zu);
        }
        }}

      //  zInfoUserService.update(infoUser);
             //   .saveOrUpdate(infoUser);
@@ -234,6 +248,7 @@
        user.setSex(userAll.getSex());
        user.setRemark(userAll.getRemark());
        user.setUpdateBy(userAll.getUpdateBy());
        user.setClanId(userAll.getClanId());
//        user.setSex(userAll.getSex()=="男"?"1":"0");
    //    user.setPostIds(userAll.getPostIds());
      //  user.set
@@ -252,10 +267,18 @@
        user.setCreateBy(getUsername());
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        userService.insertUser(user);

        //写到用户与角色对应的表
        SysUserRole sysUserRole = new SysUserRole();
        sysUserRole.setUserId(user.getUserId());
        sysUserRole.setRoleId(user.getRoleId());
        List<SysUserRole> sysUserRoles = new ArrayList<>();
        sysUserRoles.add(sysUserRole);
        sysUserRoleMapper.batchUserRole(sysUserRoles);

        //写入到 新建立的信息表里面


//        ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId());
        if (userAll.getRoleId() == 102){
        ZInfoUser infoUser = new ZInfoUser();
        infoUser.setSysId(user.getUserId());
     //   infoUser.setUserId(user.getUserId());
@@ -293,7 +316,8 @@
            ZInfoUser mother = zInfoUserService.getById(userAll.getMid());
            if (father.getIsMyFamily() == 1){
                infoUser.setFamilyId(father.getFamilyId());
                infoUser.setClanId(father.getClanId());}
                infoUser.setClanId(father.getClanId());
            }
            else if (mother.getIsMyFamily() == 1){
                infoUser.setFamilyId(mother.getFamilyId());
                infoUser.setClanId(mother.getClanId());
@@ -312,6 +336,7 @@
        // infoUser.setRoleName(user.g);

      //  if(userAll.getFamilyId()!=-1) {

        if(userAll.getRoleId()==102) {
            infoUser.setRoleId(3L);
            zInfoUserService.save(infoUser);
@@ -323,6 +348,7 @@
                zInfoUserService.updateById(zu);
            }
        }
        }

        //    zInfoUserService.saveOrUpdate(infoUser);
//            LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();