From 36ccc814cb2499757a0cfd5525d5e8d0c2309b64 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 27 十一月 2024 16:02:42 +0800
Subject: [PATCH] 企业微信的消息提醒的信息改成单号样品名+检验下单的模版保存,如果存在同名的情况,将原有的情况覆盖掉,并添加提示框+首页展示添加样品名称
---
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
index e3fa1e2..dc22aae 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
@@ -2121,7 +2121,9 @@
List<Map<String, String>> finalDeviceList = deviceList;
List<Map<String, String>> sampleList = insSampleMapper.selectSampleList(orderId);
Integer userId = insSampleUserMapper.selectOne(Wrappers.<InsSampleUser>lambdaQuery()
- .eq(InsSampleUser::getInsSampleId, insReportDto1.getSampleId()).last("limit 1")).getUserId();
+ .eq(InsSampleUser::getInsSampleId, insReportDto1.getSampleId())
+ .eq(InsSampleUser::getState,0)
+ .last("limit 1")).getUserId();
String signatureUrl;
try {
signatureUrl = userMapper.selectById(userId).getSignatureUrl();
--
Gitblit v1.9.3