数据共享，暂时只写了个人记事本

zqy

2025-01-07 6cc2e27994e273bb470eaa570e84596b4b0aec93

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

@@ -96,6 +96,24 @@
        List<SysUser> list = userService.selectUserList(user);
        return getDataTable(list);
    }
    @GetMapping("/listCommonUser")
    public TableDataInfo listCommonUser(SysUser user)
    {
        startPage();
    //    System.out.println(user.getClanId());
        System.out.println("----------------++++++++++++==0------------");
        List<SysUser> list = userService.selectCommonUserList(user);
        return getDataTable(list);
    }
    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
    @PreAuthorize("@ss.hasPermi('system:user:export')")
    @PostMapping("/exportCommonUser")
    public void exportCommonUser(HttpServletResponse response, SysUser user)
    {
        List<SysUser> list = userService.selectCommonUserList(user);
        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
        util.exportExcel(response, list, "用户数据");
    }

    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
    @PreAuthorize("@ss.hasPermi('system:user:export')")
@@ -175,7 +193,7 @@
        //System.out.println(sysUserRole.getRoleId());
        System.out.println("你好呀");
        System.out.println(user.getRoleId());
        if (user.getRoleId().equals(102L)){
        if (user.getRoleId() != null && user.getRoleId().equals(102L)){
        ZInfoUser infoUser = new ZInfoUser();
        infoUser.setUserId(user.getUserId());
        infoUser.setOldName(user.getUserName());
@@ -183,7 +201,7 @@
        infoUser.setIsMyFamily(user.getIsMyFamily());
        infoUser.setMomId(user.getMid());
        infoUser.setFatherId(user.getFid());
        infoUser.setSex(Integer.valueOf(user.getSex()));
        if (user.getSex() != null)infoUser.setSex(Integer.valueOf(user.getSex()));
//        infoUser.setFamilyId(user.getFamilyId());
        infoUser.setSysId(user.getSysId());

@@ -243,11 +261,11 @@


        }
        if(infoUser.getFamilyId()!=null)
        if(infoUser.getIsMyFamily() == 1)
            zInfoUserService.saveOrUpdate(infoUser);
        else {
            System.out.println("家庭成员不能修改为普通用户");
            return AjaxResult.success("家庭成员不能修改为普通用户");
            return AjaxResult.error("家庭成员不能修改为普通用户");
        }
        //更新配偶信息
        if(user.getSpouseId()!=null) {
@@ -288,7 +306,7 @@
        }
        else {
            System.out.println("daniuni");
            return AjaxResult.success("家庭成员不能修改为普通用户");
            return AjaxResult.error("家庭成员不能修改为普通用户");
        }

      //  zInfoUserService.update(infoUser);