From 2c4cfb7ed1ece6c3b80f7d551a267e9367ddb12b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 05 一月 2024 10:31:31 +0800 Subject: [PATCH] 整理 --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java index 5a7f8e4..5675fc4 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java +++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java @@ -222,13 +222,16 @@ */ private Company getAddCompanyModel(ErpOrgListResponse respone, Date date) { Company company = new Company(); + company.setStatus(respone.getStatus()); company.setIsdeleted(Constants.ZERO); company.setName(respone.getName()); company.setErpId(respone.getId()); company.setCreateDate(date); company.setType(Constants.ONE); company.setCode(respone.getCode()); - company.setErpParentId(respone.getParentOrgId()); + if(StringUtils.isNotBlank(respone.getParentOrgId())&&!respone.getParentOrgId().equals("orgRoot")){ + company.setErpParentId(respone.getParentOrgId()); + } company.setErpDate(date); company.setHkStatus(Constants.ZERO); return company; @@ -304,7 +307,6 @@ }else{ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍚屾ERP鏁版嵁涓虹┖锛�"); } - } public void dealRoleEmpower(Member member,Date startTime , Date endTime){ @@ -988,7 +990,7 @@ .set(ParkBook::getHkStatus,Constants.ZERO) ); //鏌ヨ杞﹀簱淇℃伅 - List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda().in(Parks::getId,param.getPartIdList())); + List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda().in(Parks::getId,param.getParkIdList())); if(CollectionUtils.isNotEmpty(parksList)){ List<ParkBook> parkBookList = new ArrayList<>(); for (Parks parks:parksList) { -- Gitblit v1.9.3