From 64d21ea59a1e96a693ab564903978aee576f5ee0 Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Tue, 30 Jan 2024 14:32:01 +0800
Subject: [PATCH] =?UTF-8?q?#=E6=A3=80=E4=BF=AE=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/alarm/tabulate/service/impl/AlarmTabulateServiceImpl.java | 1 +
 .../access/service/impl/OperAccessLibraryServiceImpl.java           | 6 ++++--
 .../com/hnac/hzims/operational/access/vo/OperAccessLibraryVO.java   | 3 ---
 .../hzims/operational/access/wrapper/OperAccessLibraryWrapper.java  | 5 ++++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/tabulate/service/impl/AlarmTabulateServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/tabulate/service/impl/AlarmTabulateServiceImpl.java
index 8dd408c..41bc208 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/tabulate/service/impl/AlarmTabulateServiceImpl.java
+++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/tabulate/service/impl/AlarmTabulateServiceImpl.java
@@ -21,6 +21,7 @@ import org.springblade.core.tool.utils.*;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessLibraryServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessLibraryServiceImpl.java
index cd1e454..b329eb2 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessLibraryServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessLibraryServiceImpl.java
@@ -99,6 +99,9 @@ public class OperAccessLibraryServiceImpl extends BaseServiceImpl<OperAccessLibr
 			if (StringUtils.isNotBlank(req.getGradeCode())) {
 				in(OperAccessLibraryEntity::getGradeCode, req.getGradeCode().split(","));
 			}
+			if(StringUtils.isNotBlank(req.getEmName())){
+				like(OperAccessLibraryEntity::getEmName, req.getEmName());
+			}
 		}};
 
 		IPage pages = super.page(Condition.getPage(query), queryWrapper);
@@ -107,8 +110,7 @@ public class OperAccessLibraryServiceImpl extends BaseServiceImpl<OperAccessLibr
 	}
 
 	/**
-	 *
-	 * .
+	 * 检修库模板下载
 	 */
 	@Override
 	public void downLoad(){
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/vo/OperAccessLibraryVO.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/vo/OperAccessLibraryVO.java
index 191638e..ad4ab1b 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/vo/OperAccessLibraryVO.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/vo/OperAccessLibraryVO.java
@@ -26,9 +26,6 @@ public class OperAccessLibraryVO extends OperAccessLibraryEntity {
 	@ApiModelProperty("修改人名称")
 	private String updateUserName;
 
-	@ApiModelProperty("设备名称")
-	private String emName;
-
 	@ApiModelProperty("危险源列表")
 	private List<DangerSourceEntity> dangerSources;
 }
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/wrapper/OperAccessLibraryWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/wrapper/OperAccessLibraryWrapper.java
index f39eca0..c9de5c5 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/wrapper/OperAccessLibraryWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/wrapper/OperAccessLibraryWrapper.java
@@ -7,6 +7,7 @@ import com.hnac.hzims.operational.access.vo.OperAccessLibraryVO;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.user.cache.UserCache;
 import org.springblade.system.user.entity.User;
 
@@ -34,7 +35,9 @@ public class OperAccessLibraryWrapper extends BaseEntityWrapper<OperAccessLibrar
 		User updateUser = UserCache.getUser(entity.getUpdateUser());
 		vo.setCreateUserName(Optional.ofNullable(createUser).map(User::getName).orElse(null));
 		vo.setUpdateUserName(Optional.ofNullable(updateUser).map(User::getName).orElse(null));
-		vo.setEmName(Optional.ofNullable(emInfoClient.getByCode(entity.getEmCode())).map(EmInfoEntity::getName).orElse(null));
+		if(StringUtil.isNotBlank(entity.getEmCode())){
+			vo.setEmName(Optional.ofNullable(emInfoClient.getByCode(entity.getEmCode())).map(EmInfoEntity::getName).orElse(null));
+		}
 		return vo;
 	}