Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-08 4e52cb2253af9a22571c7d0c239ee283178d2fd4

 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java

@@ -92,10 +92,14 @@
        save(user);
        // 保存用户角色
        String[] roles = StringUtils.splitByWholeSeparatorPreserveAllTokens(user.getRoleId(), StringConstant.COMMA);
        setUserRoles(user, roles);
        // 保存用户数据权限关联关系
        if(roles!=null){
            setUserRoles(user, roles);
        }
        String[] deptIds = StringUtils.splitByWholeSeparatorPreserveAllTokens(user.getDeptIds(), StringConstant.COMMA);
        setUserDataPermissions(user, deptIds);
        if(deptIds!=null){
            // 保存用户数据权限关联关系
            setUserDataPermissions(user, deptIds);
        }
    }

    @Override