From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 81babf3..b2edb5a 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
@@ -97,7 +97,7 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鐖剁骇缁勭粐淇℃伅灏氭湭鍚屾涓嬪彂鎴愬姛~");
}
if(Objects.nonNull(parent.getType())&&!Constants.equalsInteger(parent.getType(),-1)){
- if(Constants.equalsInteger(company.getType(),parent.getType())){
+ if(!Constants.equalsInteger(company.getType(),parent.getType())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝缁勭粐淇℃伅閿欒");
}
}else if(Objects.isNull(parent.getType())){
@@ -334,7 +334,6 @@
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍚屾涓嬪彂澶辫触锛岃绋嶅悗閲嶈瘯");
}
}
-
}
@Override
@@ -586,7 +585,7 @@
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,Constants.ZERO);
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParentName()),"c.name",pageWrap.getModel().getParentName());
- queryWrapper.orderByAsc(Company::getPinyin);
+ queryWrapper.orderByAsc(Company::getSortnum);
IPage<Company> companyIPage = companyJoinMapper.selectJoinPage(page, Company.class, queryWrapper);
return PageData.from(companyIPage);
}
@@ -616,7 +615,7 @@
wrapper.eq(Company::getIsdeleted,Constants.ZERO)
.eq(Constants.equalsInteger(type,Constants.ONE),Company::getType,type)
- .orderByAsc(Company::getPinyin);
+ .orderByAsc(Company::getSortnum);
List<Company> companies = companyMapper.selectList(wrapper);
return getCompanyTree( companies, null);
}
@@ -698,7 +697,7 @@
queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
if(Objects.nonNull(type) && ( Constants.equalsInteger(type,Constants.ONE) || Constants.equalsInteger(type,Constants.ZERO))){
// queryWrapper.eq(type!=null,Company::getType,type);
- queryWrapper.apply("( type = "+type+" or type = -1 )");
+ queryWrapper.apply("( t.type = "+type+" or t.type = -1 )");
}else if(Objects.nonNull(type) && Constants.equalsInteger(type,Constants.TWO)){
String companySpecialId = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SPECIAL_COMPANY_ID).getCode();
if(StringUtils.isNotBlank(companySpecialId)){
--
Gitblit v1.9.3