From 22e89aaf14158f746c3f49981503116ce5f01554 Mon Sep 17 00:00:00 2001
From: jiangs <373297395@qq.com>
Date: Fri, 8 Aug 2025 10:13:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czlisinterface/system/utils/CommonUtil.java |  4 ++--
 lisinterface_start/pom.xml                          | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/liscommon/src/main/java/com/czlisinterface/system/utils/CommonUtil.java b/liscommon/src/main/java/com/czlisinterface/system/utils/CommonUtil.java
index 74c6e82..7f2195e 100644
--- a/liscommon/src/main/java/com/czlisinterface/system/utils/CommonUtil.java
+++ b/liscommon/src/main/java/com/czlisinterface/system/utils/CommonUtil.java
@@ -275,7 +275,7 @@ public class CommonUtil {
      */
     public boolean getDupSqd(String bz2,String sqxmdh){
         //判断此申请单是否已经获取过
-        QueryWrapper queryWrapper = new QueryWrapper();
+        QueryWrapper<LabReqdetail> queryWrapper = new QueryWrapper();
         queryWrapper.eq("bz2",bz2);
         queryWrapper.eq("sqxmdh",sqxmdh);
         Long count = labReqdetailMapper.selectCount(queryWrapper);
@@ -289,7 +289,7 @@ public class CommonUtil {
 
     public boolean getDupSqd(String bz2,String bz1,String sqxmdh){
         //判断此申请单是否已经获取过
-        QueryWrapper queryWrapper = new QueryWrapper();
+        QueryWrapper<LabReqdetail> queryWrapper = new QueryWrapper();
         if(!bz2.equals("")) queryWrapper.eq("bz2",bz2);
         if(!bz1.equals("")) queryWrapper.eq("bz1",bz1);
         queryWrapper.eq("sqxmdh",sqxmdh);
diff --git a/lisinterface_start/pom.xml b/lisinterface_start/pom.xml
index 37c9cd2..8aae813 100644
--- a/lisinterface_start/pom.xml
+++ b/lisinterface_start/pom.xml
@@ -71,7 +71,9 @@
                         <manifestEntries>
                             <!--MANIFEST.MF 中 Class-Path 加入资源文件目录 -->
                             <Class-Path>
-                                ./config/ liscommon-1.0.jar lisinterface_jldermyy-1.0.jar
+                                ./config/
+                                liscommon-1.0.jar
+                                lisinterface_jldermyy-1.0.jar
                             </Class-Path>
                         </manifestEntries>
                     </archive>
@@ -93,9 +95,9 @@
                         <configuration>
                             <outputDirectory>${project.build.directory}/lib/</outputDirectory>
                             <!-- 排除指定的自定义 jar 包（根据 artifactId 排除） -->
-                            <excludeArtifactIds>liscommon,lisinterface_jldermyy</excludeArtifactIds>
-                            <!-- 可选：如果需要更精确，可结合 groupId 排除（这里两个依赖的 groupId 都是 org.example） -->
-<!--                             <excludeGroupIds>org.example</excludeGroupIds>-->
+<!--                            <excludeArtifactIds>liscommon,lisinterface_jldermyy</excludeArtifactIds>-->
+                            <!-- 可选：如果需要更精确，可结合 groupId 排除 -->
+                             <excludeGroupIds>org.example</excludeGroupIds>
                         </configuration>
                     </execution>
                     <!--打包自定义jar包-->
@@ -108,7 +110,8 @@
                         <configuration>
                             <outputDirectory>${project.build.directory}</outputDirectory>
                             <!-- 只包含这两个自定义 jar 包（根据 artifactId 匹配） -->
-                            <includeArtifactIds>liscommon,lisinterface_jldermyy</includeArtifactIds>
+<!--                            <includeArtifactIds>liscommon,lisinterface_jldermyy</includeArtifactIds>-->
+                            <includeGroupIds>org.example</includeGroupIds>
                         </configuration>
                     </execution>
                 </executions>