Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-06-07 2f640b1038fa331954f78ed1f4317212cf5bb34d

 north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionRoleService.java

@@ -41,11 +41,10 @@
                        JSONObject.toJSONString(permissionRoleJson.get("detail")),
                        PermissionBasic.class);
        Integer roleId = (Integer) permissionRoleMap.get("id");
        permissionRoleMapper.delete(new QueryWrapper<PermissionRole>().eq("role_id", roleId));
        if(permissionBasics.isEmpty() || roleId == null ){
            return false;
            return true;
        }


        List<PermissionRole> permissionRoles = new ArrayList<>();
        for (PermissionBasic permissionBasic : permissionBasics) {
            PermissionRole permissionRole = new PermissionRole();
@@ -53,7 +52,7 @@
            permissionRole.setPermissionId(permissionBasic.getId());
            permissionRoles.add(permissionRole);
        }
        permissionRoleMapper.delete(new QueryWrapper<PermissionRole>().eq("role_id", roleId));

        return permissionRoleMapper.saveBatch(permissionRoles);