From c41f8c8a75c4475831e3c7e9cde7467d2fb39950 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 10:38:17 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 3 ++-
company/src/components/business/OperaCompanyWindow.vue | 1 +
company/.env.development | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index 495cc66..a7e4e84 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -10,5 +10,5 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
#VUE_APP_API = 'http://localhost:10030/'
-VUE_APP_API = 'http://192.168.0.135:10030/'
-#VUE_APP_API = 'https://www.yyb.red/yyb_admin_api/'
+#VUE_APP_API = 'http://192.168.0.135:10030/'
+VUE_APP_API = 'https://www.yyb.red/yyb_admin_api/'
diff --git a/company/src/components/business/OperaCompanyWindow.vue b/company/src/components/business/OperaCompanyWindow.vue
index ba49305..d01fc90 100644
--- a/company/src/components/business/OperaCompanyWindow.vue
+++ b/company/src/components/business/OperaCompanyWindow.vue
@@ -315,6 +315,7 @@
this.$nextTick(() => {
for (const key in this.form) {
this.form[key] = target[key]
+ this.form.username=null
}
})
},
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 1d725d5..5d9c136 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
@@ -550,9 +550,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