From 3eb39f03be109adf6b3e446a77ad1408ce25a201 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 11 二月 2023 11:24:51 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/LocMastMapper.xml | 4 ----
src/main/java/com/zy/common/service/CommonService.java | 2 +-
2 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index d27601c..2588ea4 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -163,7 +163,7 @@
Short locType2 = getLocType2Small(curRow, locTypeDto.getLocType1());
locMast = locMastService.queryFreeLocMast2(curRow, locTypeDto.getLocType1() ,locType2);
} else { //榛樿瑙勫垯
- locMast = locMastService.queryFreeLocMast2(curRow, locTypeDto.getLocType1(),(short)0);
+ locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
}
}
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 57b8a01..5749de9 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -73,10 +73,6 @@
<if test="locType2 != null and locType != 0">
and loc_type2 = #{locType2}
</if>
- <if test="locType2 != null and locType == 0">
- and loc_type2 != null
- and loc_type2 != #{locType2}
- </if>
<if test="locType1 != null">
and loc_type1 = #{locType1}
</if>
--
Gitblit v1.9.1