From c0f4b90b5b6a45f044a694b5e3837cabfdcbf3aa Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 07 五月 2025 18:57:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 c43ea3f..2d2015e 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())){
@@ -697,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