From e9d0eb5d4f43c3cd5a37283151d69683b3ddd6bf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 02 九月 2025 15:05:10 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 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..da804c5 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
@@ -334,14 +334,24 @@
@RequestMapping(value = "/add")
@ResponseBody
public Object add(TCompany tCompany,@RequestParam String subArr,String account,String password) {
+ String name = tCompany.getName();
+ name = name.replaceAll("& lt;", "<");
+ name = name.replaceAll("& gt;", ">");
+ name = name.replaceAll("& #40;", "(");
+ name = name.replaceAll("& #41;", ")");
+ tCompany.setName(name);
//判断账号是否已存在
int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
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;
@@ -352,6 +362,7 @@
CreateEnterpriseRequest request = new CreateEnterpriseRequest();
request.setName(tCompany.getName());
request.setNickName(tCompany.getName());
+ request.setUscc(tCompany.getIdentifier());
request.setIndustry_code("123456");
request.setMobile(account);
CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
@@ -497,7 +508,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());
@@ -519,6 +530,12 @@
@RequestMapping(value = "/update")
@ResponseBody
public Object update(TCompany tCompany,@RequestParam String subArr,String account,String password,Integer userId) {
+ String name = tCompany.getName();
+ name = name.replaceAll("& lt;", "<");
+ name = name.replaceAll("& gt;", ">");
+ name = name.replaceAll("& #40;", "(");
+ name = name.replaceAll("& #41;", ")");
+ tCompany.setName(name);
User user = userService.selectById(userId);
if(null != user && ToolUtil.isNotEmpty(password)){
user.setPassword(ShiroKit.md5(password, user.getSalt()));
@@ -552,6 +569,12 @@
@RequestMapping(value = "/updateFranchisee")
@ResponseBody
public Object updateFranchisee(TCompany tCompany,String account,String password,Integer userId) {
+ String name = tCompany.getName();
+ name = name.replaceAll("& lt;", "<");
+ name = name.replaceAll("& gt;", ">");
+ name = name.replaceAll("& #40;", "(");
+ name = name.replaceAll("& #41;", ")");
+ tCompany.setName(name);
tCompany.setUpdateTime(new Date());
tCompany.setVersion(tCompany.getVersion() + 1);
tCompanyService.updateById(tCompany);
@@ -569,13 +592,22 @@
@RequestMapping(value = "/addFranchisee")
@ResponseBody
public Object addFranchisee(TCompany tCompany,String account,String password) {
+ String name = tCompany.getName();
+ name = name.replaceAll("& lt;", "<");
+ name = name.replaceAll("& gt;", ">");
+ name = name.replaceAll("& #40;", "(");
+ name = name.replaceAll("& #41;", ")");
+ tCompany.setName(name);
//判断账号是否已存在
int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
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;
@@ -588,6 +620,7 @@
CreateEnterpriseRequest request = new CreateEnterpriseRequest();
request.setName(tCompany.getName());
request.setNickName(tCompany.getName());
+ request.setUscc(tCompany.getIdentifier());
request.setIndustry_code("123456");
request.setMobile(account);
CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
@@ -604,8 +637,8 @@
}
//企业已注册
if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
+ enterCode = checkEnterExist.getEnterCode();
List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, enterCode);
- enterCode = checkEnterExist.getEnterCode();
enterNew = 0;
if(null == userInfoByPhone || userInfoByPhone.size() == 0){
SaveStaffNodeRequest request = new SaveStaffNodeRequest();
--
Gitblit v1.7.1