Merge remote-tracking branch 'origin/master'

k94314517

2024-05-27 ea8dea301e82be074187b10bdbe130c9802bede0

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java

@@ -67,6 +67,10 @@
                param.setPageSize(100);
                BaseResponse<PrivilegeGroupListResponse> response = HKService.privilegeGroup(param);
                if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
                    response = HKService.privilegIccmeGroup(param);//接口V1版本不存在，调用iccm版本接口
                }
                if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
                    response = HKService.privilegIccmeGroup(param);
                    throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，海康同步数据失败~");
                }
                PrivilegeGroupListResponse r = response.getData();