From 77d8f6ccb72cb64c29e77c39fcc8298781d008bb Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期四, 02 一月 2025 15:22:22 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java index 549fa40..613cd7a 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java @@ -10,16 +10,18 @@ import com.doumee.core.constants.ResponseStatus; import com.doumee.core.erp.ErpConstants; import com.doumee.core.erp.ErpTool; -import com.doumee.core.erp.model.openapi.request.erp.*; +import com.doumee.core.erp.model.openapi.request.*; +import com.doumee.core.erp.model.openapi.request.erp.OrgListRequest; +import com.doumee.core.erp.model.openapi.request.erp.UserFailRequest; +import com.doumee.core.erp.model.openapi.request.erp.UserListRequest; +import com.doumee.core.erp.model.openapi.response.*; import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse; +import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse; +import com.doumee.core.erp.model.openapi.response.erp.ErpUserListResponse; import com.doumee.core.exception.BusinessException; import com.doumee.core.haikang.model.HKConstants; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; -import com.doumee.core.erp.model.openapi.request.*; -import com.doumee.core.erp.model.openapi.response.*; -import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse; -import com.doumee.core.erp.model.openapi.response.erp.ErpUserListResponse; import com.doumee.core.utils.Constants; import com.doumee.core.utils.DESUtil; import com.doumee.core.utils.DateUtil; @@ -31,8 +33,8 @@ import com.doumee.dao.business.join.DeviceEventJoinMapper; import com.doumee.dao.business.join.VisitEventJoinMapper; import com.doumee.dao.business.model.*; -import com.doumee.service.business.ext.ERPSyncService; import com.doumee.service.business.InterfaceLogService; +import com.doumee.service.business.ext.ERPSyncService; import com.doumee.service.business.impl.MemberServiceImpl; import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -119,7 +121,7 @@ private WxPlatNotice wxPlatNotice; @Override - @PostConstruct +// @PostConstruct public int initHkConfig(){ ErpConstants.approveUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_APPROVE_URL).getCode(); ErpConstants.orgListUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_ORGLIST_URL).getCode(); -- Gitblit v1.9.3