From 39500edd05aced7a2d9debba5a243b756dd2a939 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 22 十月 2024 09:13:37 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 1e84509..a79a985 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
@@ -36,7 +36,6 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
-import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -104,6 +103,7 @@
}
}
idPath = parent.getCompanyPath();
+ company.setHkParentId(parent.getHkId());
company.setCompanyPath(parent.getCompanyPath()+company.getId()+"/");
company.setCompanyNamePath(parent.getCompanyNamePath()+"/"+company.getName());
}
@@ -134,7 +134,7 @@
List<OrgAddRequest> addList = new ArrayList<>();
addList.add(getOrgAddModel(company));
BaseResponse<OrgOrUserAddResponse> result = HKService.addBatchOrg(addList);
- if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
+ if(result !=null && StringUtils.equals(result.getCode(), HKConstants.RESPONSE_SUCCEE)){
OrgOrUserAddResponse data = result.getData();
if(data.getSuccesses()!=null && data.getSuccesses().size()>0){
//澶勭悊鏂板鎴愬姛鐨勬暟鎹紝淇敼娴峰悍鍚屾鐘舵��
@@ -156,6 +156,7 @@
}
private boolean delHkOrg(Company company) {
OrgDelRequest request =new OrgDelRequest();
+
request.setIndexCodes(new String[]{company.getHkId()});
BaseResponse<List<OrgUpdateFailureResponse>> result = HKService.delBatchOrg(request);
if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
@@ -232,6 +233,7 @@
.eq(Member::getIsdeleted,Constants.ZERO)) >0){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇ラ儴闂ㄤ笅瀛樺湪浜哄憳淇℃伅锛屼笉鑳借繘琛屽垹闄ゆ搷浣滐紒");
}
+
Company company = new Company();
company.setId(id);
company.setEditDate(new Date());
@@ -241,7 +243,7 @@
company.setHkDate(company.getHkDate());
companyMapper.updateById(company);
//涓嬪彂娴峰悍瀹夐槻骞冲彴
- if(StringUtils.isBlank(model.getHkId()) && Constants.equalsInteger(Constants.ONE,model.getHkStatus()) && !delHkOrg(model)){
+ if(StringUtils.isNotBlank(model.getHkId()) && Constants.equalsInteger(Constants.ONE,model.getHkStatus()) && !delHkOrg(model)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍒犻櫎涓嬪彂澶辫触锛岃纭璇ョ粍缁囨棤涓嬬骇缁勭粐鎴栫粍缁囦汉鍛樹俊鎭瘇");
}
}
@@ -292,7 +294,8 @@
if(companyJoinMapper.selectCount(new QueryWrapper<Company>().lambda()
.eq(Company::getIsdeleted,Constants.ZERO )
.eq(Company::getType,Constants.ONE )
- .likeRight(Company::getCompanyPath,company.getCompanyPath())) >0){
+ .ne(Company::getId,model.getId())
+ .likeRight(Company::getCompanyPath,model.getCompanyPath())) >0){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝涓嬬骇閮ㄩ棬瀛樺湪鍐呴儴缁勭粐锛岃閮ㄩ棬涓嶆敮鎸佸垏鎹负鐩稿叧鏂圭粍缁囷紒~");
}
}
@@ -482,13 +485,11 @@
companyMapper.updateById(company);
}
-
@Override
public long count(Company company) {
QueryWrapper<Company> wrapper = new QueryWrapper<>(company);
return companyMapper.selectCount(wrapper);
}
-
@Override
public List<CompanyDTO> findCompanyTreePage(Integer type) {
@@ -500,7 +501,6 @@
List<Company> companies = companyMapper.selectList(wrapper);
return getCompanyTree( companies, null);
}
-
private List<CompanyDTO> getCompanyTree(List<Company> companies, String parentId){
if (CollectionUtils.isEmpty(companies)){
@@ -576,7 +576,7 @@
queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Company::getEditor);
queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
queryWrapper.eq(type!=null,Company::getType,type);
- queryWrapper.orderByAsc(Company::getSortnum );
+ queryWrapper.orderByAsc(true,"t.sortnum");
List<Company> companyList = companyJoinMapper.selectJoinList(Company.class,queryWrapper);
//閰嶇疆缁勫憳浜哄憳绫诲瀷鏉ユ簮鏂瑰紡 0鑷缓 1ERP
CompanyTree treeBuild = new CompanyTree(companyList, dataSyncConfig.getOrgUserDataOrigin());
@@ -618,7 +618,8 @@
if (currentMenuIndex - 1 < 0) {
return;
}
- Company preMenu = companyPool.remove(currentMenuIndex - 1);
+ Company preMenu = companyPool.get(currentMenuIndex - 1);
+ companyPool.remove(currentMenuIndex - 1);
companyPool.add(currentMenuIndex, preMenu);
}
// 涓嬬Щ
--
Gitblit v1.9.3