From 21ffe102c317e84b5b47462e4c7eb842c8c07f99 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 23 Jul 2024 17:26:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20scc=E6=B5=81=E7=A8=8B=E5=8A=9E=E7=90=86?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProcessStandardComplianceCheckDetail.java  |  1 +
 .../impl/LawsEvaluationNotMetLibraryServiceImpl.java  | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
index b7b37fde..e48b7a27 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
@@ -225,6 +225,7 @@ public class ProcessStandardComplianceCheckDetail implements Serializable {
     @ApiModelProperty(value = "是否与上一版相同（字典：1：是，0：否）")
     @Excel(name = "是否与上一版相同", width = 15, dicCode = "yn")
     @Dict(dicCode = "yn")
+    @TableField(exist = false)
     private String isSameAsPrevVersion;
 
     /**
diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
index 995202c5..d0b04562 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
@@ -51,9 +51,20 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl<LawsEval
     @Value("${jero.path.exportExcelTempPath}")
     private String exportExcelTempPath;
     private static final String EXPORT_EXCEL_TEMP = "exportExcelTemp";
+    /**
+     * 法规管理员
+     */
+    @Value("${sys_role.laws_admin}")
+    private String lawsAdmin;
+    /**
+     * 超级管理员
+     */
+    @Value("${sys_role.super_admin}")
+    private String superAdmin;
 
     @Override
     public IPage<LawsEvaluationNotMetLibrary> queryPage(LawsEvaluationNotMetLibrary lawsEvaluationNotMet, Integer pageNo, Integer pageSize, HttpServletRequest req) {
+        // TODO 权限
         QueryWrapper<LawsEvaluationNotMetLibrary> queryWrapper = QueryGenerator.initQueryWrapper(lawsEvaluationNotMet, req.getParameterMap());
         queryWrapper.like(StringUtils.isNotBlank(lawsEvaluationNotMet.getStandardNumber()),
                 "nm.standard_number", lawsEvaluationNotMet.getStandardNumber());