k94314517
2024-03-01 d31ac24ac68ce6da41df55aa8afe1bed8c012e29
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -387,12 +387,14 @@
        Member member = new Member();
        BeanUtils.copyProperties(param,member);
        member.setCreateDate(date);
        if(StringUtils.isBlank(param.getFaceImg())){
        /*if(StringUtils.isBlank(param.getFaceImg())){
            member.setHkStatus(Constants.THREE);
        }else{
            member.setHkStatus(Constants.ZERO);
            member.setRemark("待同步安防平台");
        }
        }*/
        member.setHkStatus(Constants.ZERO);
        member.setRemark("待同步安防平台");
        member.setErpStatus(Constants.ONE);
        member.setErpDate(date);
        member.setErpId(param.getId());
@@ -406,6 +408,7 @@
        member.setRoleIds(param.getRoleIds());
        member.setCompanyId(Objects.isNull(company)?null:company.getId());
        member.setErpOrgId(param.getOrgId());
        member.setCanVisit(Constants.ONE);
//        member.setStartTime(request.getStartTime());
//        member.setEndTime(request.getEndTime());
        return  member;
@@ -521,6 +524,11 @@
                   for (DeviceRole deviceRole:deviceRoleList) {
                       RoleListResponse roleListResponse = new RoleListResponse();
                       BeanUtils.copyProperties(deviceRole,roleListResponse);
                       if(deviceRole.getType().equals(Constants.TWO)){
                           roleListResponse.setType(Constants.ONE);
                       }else{
                           roleListResponse.setType(Constants.ZERO);
                       }
                       if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
                           List<DeviceListResponse> DeviceListResponseList = new ArrayList<>();
                           List<String>  doorList = Arrays.asList(deviceRole.getDoorIds().split(","));