From a76c5c86ac9af71da45bf78c825a2c7aa843b4c8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 一月 2024 15:35:54 +0800
Subject: [PATCH] Revert "Mr.Shi"
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index ffd8aca..3bf4e3b 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -72,9 +72,10 @@
if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
.eq(Company::getCode,company.getCode())
.or().eq(Company::getPhone,company.getPhone())
+ .or().eq(Company::getEmail,company.getEmail())
.or().eq(Company::getUsername,company.getUsername())
.or().eq(Company::getName,company.getName()))>0){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愬悕绉般�戙�愮粺涓�淇＄敤浠ｇ爜鎴栬�呫�愭墜鏈哄彿銆戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愬悕绉般�戙�愮粺涓�淇＄敤浠ｇ爜銆戙�愰偖绠便�戞垨鑰呫�愭墜鏈哄彿銆戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
company.setCreator(user.getId());
@@ -340,7 +341,9 @@
|| StringUtils.isBlank(company.getCaptche())){
throw new BusinessException(ResponseStatus.BAD_REQUEST );
}
- SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche());
+ if(!debugModel){
+ SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche());
+ }
Company model = companyMapper.selectById(company.getId());
if(model == null || StringUtils.equals(model.getPhone(),company.getPhone()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎵嬫満鍙锋湭鍙戠敓鏀瑰彉~" );
@@ -404,10 +407,11 @@
if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
.ne(Company::getId,company.getId())
.and(w->w.eq(Company::getCode,company.getCode())
+ .or().eq(Company::getEmail,company.getEmail())
.or().eq(Company::getUsername,company.getUsername())
.or().eq(Company::getName,company.getName()))
)>0){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愬悕绉般�戙�愮粺涓�淇＄敤浠ｇ爜鎴栬�呫�愪紒涓氳处鍙枫�戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愬悕绉般�戙�愮粺涓�淇＄敤浠ｇ爜銆戙�愰偖绠便�戞垨鑰呫�愪紒涓氳处鍙枫�戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Constants.equalsInteger(model.getSignIdStatus(),Constants.ONE)){
@@ -460,7 +464,7 @@
@Override
public Company findById(Integer id) {
- Company model = findById(id);
+ Company model = companyMapper.selectById(id);
if(model == null ||Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
@@ -654,10 +658,9 @@
}else {
wrapper.lambda().in(Company::getId, user.getCompanyIdList());
}
-// queryWrapper.exists("select b.id from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id");
- } else if (company.getQueryFlag() == 1) {
+ } else if (company.getQueryFlag() == 1 && company.getUserId()!=null) {
//鏌ヨ鏄惁鏈夋煡鐪嬫瑠闄�
- wrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
+ wrapper.select("*,(select count(1) from company_permission b where b.user_id="+company.getUserId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
}
return companyMapper.selectList(wrapper);
}
--
Gitblit v1.9.3