From 8399270e3f12301ddf143c87bec9ca1be7b54ff0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 15 八月 2025 11:05:18 +0800
Subject: [PATCH] 合并代码
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
index 876fd9b..77c2f1f 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
@@ -339,9 +339,13 @@
if (count > 0) {
return "error";
}
+ if(ToolUtil.isEmpty(tCompany.getIdentifier())){
+ return "统一社会信用代码不能为空";
+ }
//调用中台接口创建企业
- CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
- String enterCode = "";
+// CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
+ CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterExistByEnterIdCardNo(tCompany.getIdentifier());
+ String enterCode = "";
Integer enterNew = null;
Long empId = null;
Integer empnew = null;
@@ -497,7 +501,7 @@
TCompany tCompany = tCompanyService.selectById(tCompanyId);
//调用中台接口创建企业
if(1 == tCompany.getEnterNew()){
- CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
+ CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterExistByEnterIdCardNo(tCompany.getIdentifier());
if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
ShiroUser user1 = shiroExtUtil.getUser();
User user = userService.selectById(user1.getId());
@@ -574,8 +578,11 @@
if (count > 0) {
return "error";
}
+ if(ToolUtil.isEmpty(tCompany.getIdentifier())){
+ return "统一社会信用代码不能为空";
+ }
//调用中台接口创建企业
- CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
+ CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterExistByEnterIdCardNo(tCompany.getIdentifier());
String enterCode = "";
Long empId = null;
Integer empnew = null;
--
Gitblit v1.7.1