From 995dd1cd9f0763627a17673503a7230a81cc8591 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 11 Apr 2024 10:53:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=96=E6=A0=87=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8D=95=E7=8B=AC=E6=9F=A5=E8=AF=A2=E6=9D=83?=
 =?UTF-8?q?=E9=99=90-=E6=94=AF=E6=8C=81=E4=BC=A0=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=8F=B7=E4=B8=8D=E4=BC=A0Id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/EnterpriseStandardAuthUserService.java  |  2 +-
 .../impl/EnterpriseStandardAuthUserServiceImpl.java | 13 ++++++++++++-
 .../standard/controller/LawsOverseasController.java |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthUserService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthUserService.java
index fd2792d0..dfe84c05 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthUserService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthUserService.java
@@ -109,5 +109,5 @@ public interface EnterpriseStandardAuthUserService extends IService<EnterpriseSt
      * @param userId
      * @return
      */
-    boolean fbDetailPermission(String standardId, String userId);
+    boolean fbDetailPermission(String standardId, String standardNumber, String userId);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java
index b026988e..ddc291f6 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java
@@ -11,6 +11,7 @@ import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.util.MessageUtils;
 import com.jero.modules.laws.common.constant.FieldCommon;
+import com.jero.modules.laws.common.vo.ManyStandardSelectionBox;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser;
 import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardAuthUserMapper;
@@ -18,6 +19,7 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptServic
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService;
 import com.jero.modules.laws.standard.controller.TempAuthRecordQueryDto;
 import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
+import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
 import com.jero.modules.laws.standard.entity.LawsStandardTempPermission;
 import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
 import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
@@ -504,7 +506,16 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
     }
 
     @Override
-    public boolean fbDetailPermission(String standardId, String userId) {
+    public boolean fbDetailPermission(String standardId, String standardNumber,String userId) {
+        if (StrUtil.isBlank(standardId) && StrUtil.isBlank(standardNumber)) {
+            throw new JeroBootException("标准id和标准编号不能同时为空");
+        }
+        if (StrUtil.isBlank(standardId)) {
+            LambdaQueryWrapper<LawsOverseasStandard> fbWrapper = new LambdaQueryWrapper<>();
+            fbWrapper.eq(LawsOverseasStandard::getStandardNumber, standardNumber);
+            LawsOverseasStandard fb = fbService.getOne(fbWrapper);
+            standardId = fb.getId();
+        }
         // 管理员有所有企标的权限
         SysUser currentUser = sysUserService.getById(userId);
         // 管理员有所有企标的权限
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java
index 900eb503..082cf5be 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java
@@ -146,7 +146,7 @@ public class LawsOverseasController {
     public Result<Map<String,Object>> getByIdAndModule(@RequestParam(name="id", required = false) @ApiParam("主键") String id,
                                                        @RequestParam(name="type") @ApiParam("类型（1详情，2新增编辑）") String type,
                                                        @RequestParam(name="standardNumber", required = false) @ApiParam("标准编号") String standardNumber) {
-        if (!authUserService.fbDetailPermission(id, UserUtils.getUserId())) {
+        if (!authUserService.fbDetailPermission(id, standardNumber, UserUtils.getUserId())) {
             throw new JeroBootException("暂无该外标查看权限");
         }
         lawsCommonService.addLookHistory(id, type, MODULE_VALUE, standardNumber);