From 01024f24c1793c8b7855e822783ca87d16672876 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 八月 2025 14:24:46 +0800
Subject: [PATCH] update
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java
index a99d72c..91a25fd 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java
@@ -165,13 +165,17 @@
return R.fail("该公司已发布");
}
// 判断水母报告和 公司名称是否一致
- String link = dto.getLink();
- String sign = extractSnFromUrl(link);
- boolean b = checkName(dto.getCompanyName(), sign);
- if(b){
- return R.fail("水母报告和公司名称不一致");
+ if(dto.getTaxpayerType()!=3){
+ if(dto.getLink()==null){
+ return R.fail("请上传水母报告");
+ }
+ String link = dto.getLink();
+ String sign = extractSnFromUrl(link);
+ boolean b = checkName(dto.getCompanyName(), sign);
+ if(b){
+ return R.fail("水母报告和公司名称不一致");
+ }
}
-
String companyId = tbCompanyService.pushCompany(dto, userId);
return R.ok(companyId);
}
@@ -224,11 +228,16 @@
return R.fail("订单状态不能修改");
}
// 判断水母报告和 公司名称是否一致
- String link = dto.getLink();
- String sign = extractSnFromUrl(link);
- boolean b = checkName(dto.getCompanyName(), sign);
- if(b){
- return R.fail("水母报告和公司名称不一致");
+ if(dto.getTaxpayerType()!=3){
+ if(dto.getLink()==null){
+ return R.fail("请上传水母报告");
+ }
+ String link = dto.getLink();
+ String sign = extractSnFromUrl(link);
+ boolean b = checkName(dto.getCompanyName(), sign);
+ if(b){
+ return R.fail("水母报告和公司名称不一致");
+ }
}
tbCompanyService.editCompany(dto,company,userId);
return R.ok(dto.getId());
@@ -457,10 +466,16 @@
return R.fail("参数错误");
}
TbCompany company = tbCompanyService.getById(companyId);
+
String link = company.getLink();
- String sign = extractSnFromUrl(link);
- Object report = getReport(sign);
- return R.ok(report);
+ if(link!=null){
+ String sign = extractSnFromUrl(link);
+ Object report = getReport(sign);
+ return R.ok(report);
+ }else {
+ return R.ok(new Object());
+ }
+
}
--
Gitblit v1.7.1