#

LSH

2023-02-11 3eb39f03be109adf6b3e446a77ad1408ce25a201

#

 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());
            }
        }


 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>