From 9bc128d735e8921b14bac85dabbbcbc5b497c5d1 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 12 十一月 2025 14:17:34 +0800
Subject: [PATCH] 问题修复
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 7336cb7..34b0097 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -132,7 +132,7 @@
company.setIsdeleted(Constants.ZERO);
company.setHkStatus(Constants.ONE);
company.setStatus(Constants.ZERO);
- company.setSortnum(0);//榛樿鏈�涓婇潰
+ company.setSortnum(Objects.isNull(company.getSortnum())?0:company.getSortnum());
company.setHkDate(company.getCreateDate());
company.setEditDate(company.getCreateDate());
company.setEditor(company.getCreator());
@@ -292,7 +292,7 @@
if(company.getId() == null|| StringUtils.isBlank(company.getName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- if(company.getType()!=null && !(company.getType() ==0 || company.getType() ==1)){
+ if(company.getType()!=null && !(company.getType() ==0 || company.getType() ==1 || company.getType() ==-1)){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐绫诲瀷涓嶆纭紝璇锋寜瑕佹眰濉啓~");
}
//鏌ヨ鍚嶇О涓嶈兘閲嶅
@@ -324,6 +324,7 @@
company.setType(null);
company.setEditDate(new Date());
company.setEditor(user.getId());
+
company.setHkStatus(Constants.ONE);
company.setHkDate(company.getHkDate());
company.setHkId(StringUtils.defaultString(model.getHkId(),UUID.randomUUID().toString().replace("-","")));
@@ -961,7 +962,7 @@
company.setCompanyNamePath(company.getName());//鍚嶇О璺緞
company.setHkParentId(rootOrgId);
String idPath = "";
- if(StringUtils.isNotBlank(company.getErpParentId()) && !StringUtils.equals(company.getErpParentId(),Constants.ONE+"")){
+ if(StringUtils.isNotBlank(company.getErpParentId())){
Company parent = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,company.getErpParentId())
.eq(Company::getIsdeleted,Constants.ZERO).last(" limit 1 "));
if(parent == null || Constants.equalsInteger(parent.getIsdeleted(),Constants.ONE)){
@@ -981,6 +982,7 @@
company.setHkParentId(parent.getHkId());
company.setCompanyPath(parent.getCompanyPath()+company.getId()+"/");
company.setCompanyNamePath(parent.getCompanyNamePath()+"/"+company.getName());
+ company.setParentId(parent.getId());
}
company.setHkCompanyPath(company.getCompanyNamePath());
company.setCreateDate(new Date());
@@ -1009,7 +1011,7 @@
public Company syncDDEditCompanyModel(OapiV2DepartmentGetResponse.DeptGetResponse deptGetResponse,Company company){
company.setErpParentId(deptGetResponse.getParentId().toString());
String idPath = "";
- if(StringUtils.isNotBlank(company.getErpParentId()) && !StringUtils.equals(company.getErpParentId(),Constants.ONE+"")){
+ if(StringUtils.isNotBlank(company.getErpParentId())){
Company parent = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,company.getErpParentId())
.eq(Company::getIsdeleted,Constants.ZERO).last("limit 1 "));
if(parent == null || Constants.equalsInteger(parent.getIsdeleted(),Constants.ONE)){
@@ -1026,6 +1028,7 @@
company.setHkParentId(parent.getHkId());
company.setCompanyPath(parent.getCompanyPath()+company.getId()+"/");
company.setCompanyNamePath(parent.getCompanyNamePath()+"/"+company.getName());
+ company.setParentId(parent.getId());
}
company.setName(deptGetResponse.getName());
--
Gitblit v1.9.3