From 62add639e728eb1c99f3545824e2f36028b33f3a Mon Sep 17 00:00:00 2001
From: liwen <w790785492@163.com>
Date: Tue, 13 Aug 2024 11:27:07 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=AE=89=E5=85=A8=E5=B7=A5=E5=99=A8?=
 =?UTF-8?q?=E5=85=B7=E7=B1=BB=E5=9E=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzims/safeproduct/entity/SafetyToolTypeEntity.java     | 2 +-
 .../hzims/safeproduct/service/impl/SafetyToolTypeServiceImpl.java   | 6 ++++++
 hzims-service/safeproduct/src/main/resources/db/3.0.0.sql           | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SafetyToolTypeEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SafetyToolTypeEntity.java
index 0d689b2..b3113bc 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SafetyToolTypeEntity.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SafetyToolTypeEntity.java
@@ -51,7 +51,7 @@ public class SafetyToolTypeEntity extends TenantEntity {
 	private Date sendTime;
 
 	@ApiModelProperty(value = "机构id")
-	private Long deptId;
+	private String deptId;
 
 	@ApiModelProperty(value = "机构名称")
 	private String deptName;
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolTypeServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolTypeServiceImpl.java
index 94ff245..39bc18d 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolTypeServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolTypeServiceImpl.java
@@ -137,6 +137,9 @@ public class SafetyToolTypeServiceImpl extends ServiceImpl<SafetyToolTypeMapper,
 			if (StringUtil.isNotBlank(req.getEndSendTime())) {
 				le("send_time", req.getEndSendTime());
 			}
+			if (StringUtil.isNotBlank(req.getDeptId())) {
+				eq("dept_id", req.getDeptId());
+			}
 		}};
 		IPage<SafetyToolTypeEntity> safetyToolTypePages = super.page(Condition.getPage(query), queryWrapper);
 		IPage<SafetyToolTypeVO> pages = new Page<>();
@@ -171,6 +174,9 @@ public class SafetyToolTypeServiceImpl extends ServiceImpl<SafetyToolTypeMapper,
 			if (StringUtil.isNotBlank(param.getEndSendTime())) {
 				le("send_time", param.getEndSendTime());
 			}
+			if (StringUtil.isNotBlank(param.getDeptId())) {
+				eq("dept_id", param.getDeptId());
+			}
 		}};
 		List<SafetyToolTypeEntity> types = this.list(queryWrapper);
 		if(CollectionUtil.isEmpty(types)){
diff --git a/hzims-service/safeproduct/src/main/resources/db/3.0.0.sql b/hzims-service/safeproduct/src/main/resources/db/3.0.0.sql
index ac9d443..a090039 100644
--- a/hzims-service/safeproduct/src/main/resources/db/3.0.0.sql
+++ b/hzims-service/safeproduct/src/main/resources/db/3.0.0.sql
@@ -10,5 +10,5 @@ ALTER TABLE `hzims_risk_hazard_task`
     ADD COLUMN `remark` text NULL ;
 
 ALTER TABLE `hzims_safe_safety_tool_type`
-    ADD COLUMN `dept_id` bigint(20) DEFAULT NULL COMMENT '机构id',
-    ADD COLUMN `dept_name` varchar(20) DEFAULT NULL COMMENT '机构名称';
\ No newline at end of file
+    ADD COLUMN `dept_id` varchar(50) DEFAULT NULL COMMENT '机构id',
+    ADD COLUMN `dept_name` varchar(50) DEFAULT NULL COMMENT '机构名称';
\ No newline at end of file