Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

jiangping

2024-05-07 529d0b8982cf30f57ba7e366c0f822c1d82c0b69

 server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java

@@ -62,9 +62,12 @@
        }
        loginUserInfo.setRoles(rs);
        // 设置权限信息

        List<String> pms = new ArrayList<>();
        for (SystemPermission permission : permissions) {
            pms.add(permission.getCode());
        if(permissions!=null){
            for (SystemPermission permission : permissions) {
                pms.add(permission.getCode());
            }
        }
        loginUserInfo.setPermissions(pms);
        loginUserInfo.setCompanyIdList(user.getCompanyIdList());