From 59105ca592172cb2d91b0f12b8b3c9fa8c079334 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 十月 2024 09:34:28 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 715ab5c..549104a 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
@@ -38,6 +38,7 @@
import java.lang.reflect.Array;
import java.net.URI;
import java.net.URLEncoder;
+import java.nio.charset.Charset;
import java.util.*;
/**
@@ -176,8 +177,9 @@
if(fileList == null || fileList.size() == 0){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- String fileName = model.getName() +"_浼佷笟璇佷欢_"+System.currentTimeMillis()+".zip" ;
- String encodeFileName = URLEncoder.encode(fileName);
+
+ String fileName = model.getName() +"-浼佷笟璇佷欢-"+System.currentTimeMillis() ;
+ String encodeFileName =URLEncoder.encode(fileName, Charset.forName("UTF-8").toString())+".zip";
response.setHeader("Content-Disposition","attachment;filename=" + encodeFileName);
response.setContentType("application/octet-stream");
response.setHeader("eva-opera-type", "download");
@@ -365,8 +367,8 @@
||StringUtils.isBlank(company.getEmail())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-
- if(!debugModel){
+ String phoneAtuh = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.COMPANY_PHONE_AUTH).getCode();
+ if(!debugModel && !StringUtils.equals(phoneAtuh,Constants.ONE+"")){
//鎵嬫満楠岃瘉鐮佹牎楠�
SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche());
}
@@ -485,7 +487,8 @@
|| StringUtils.isBlank(company.getCaptche())){
throw new BusinessException(ResponseStatus.BAD_REQUEST );
}
- if(!debugModel){
+ String phoneAtuh = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.COMPANY_PHONE_AUTH).getCode();
+ if(!debugModel && !StringUtils.equals(phoneAtuh,Constants.ONE+"")){
SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche());
}
Company model = companyMapper.selectById(company.getId());
@@ -549,9 +552,10 @@
if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
.ne(Company::getId,company.getId())
+ .eq(Company::getIsdeleted,Constants.ZERO)
.and(w->w.eq(Company::getCode,company.getCode())
.or().eq(Company::getEmail,company.getEmail())
- .or().eq(Company::getUsername,company.getUsername())
+// .or().eq(Company::getUsername,company.getUsername())
.or().eq(Company::getName,company.getName()))
)>0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愬悕绉般�戙�愮粺涓�淇＄敤浠ｇ爜銆戙�愰偖绠便�戞垨鑰呫�愪紒涓氳处鍙枫�戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
--
Gitblit v1.9.3