From 3e6ff1a0879cefe709870683211a2e31476af48a Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Tue, 30 Apr 2024 16:32:57 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/zhgd/mybatis/DataScopeHandler.java | 1 +
.../basicdata/mapper/xml/SystemUserMapper.xml | 3 +
.../basicdata/service/ISystemUserService.java | 14 +-
.../entity/DangerousEngineeringRecord.java | 41 +++---
.../xml/DangerousEngineeringRecordMapper.xml | 13 +-
.../modules/video/mapper/VideoItemMapper.java | 2 +
.../impl/UserDevAuthorityServiceImpl.java | 2 +-
...gerousEngineeringAcceptanceController.java | 130 +++++++++++++++++
.../XzDangerousEngineeringAcceptance.java | 133 ++++++++++++++++++
...zDangerousEngineeringAcceptanceMapper.java | 26 ++++
...XzDangerousEngineeringAcceptanceMapper.xml | 19 +++
...DangerousEngineeringAcceptanceService.java | 27 ++++
...erousEngineeringAcceptanceServiceImpl.java | 111 +++++++++++++++
13 files changed, 496 insertions(+), 26 deletions(-)
create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/controller/XzDangerousEngineeringAcceptanceController.java
create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/entity/XzDangerousEngineeringAcceptance.java
create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzDangerousEngineeringAcceptanceMapper.java
create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzDangerousEngineeringAcceptanceMapper.xml
create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/service/IXzDangerousEngineeringAcceptanceService.java
create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzDangerousEngineeringAcceptanceServiceImpl.java
diff --git a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java
index a87f0f523..1bc972c5e 100644
--- a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java
+++ b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java
@@ -100,6 +100,7 @@ public class DataScopeHandler implements DataPermissionHandler {
tables.put("xz_material", "enterprise_id");
tables.put("inspect_task_record", "enterprise_id");
tables.put("xz_security_inspect_task_record", "enterprise_id");
+ tables.put("xz_security_quality_inspection_record", "enterprise_id");
return tables;
}
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml
index 2879fd0dd..716d5b1f3 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml
@@ -35,6 +35,9 @@
and pe.enterprise_type_id = #{enterpriseTypeId}
+
+ and a.user_id = #{userId}
+