Merge branch 'feat-20230724-fujianqifu' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageMapper.xml

@@ -1518,6 +1518,9 @@
 			<if test="query.subType != null and query.subType != ''">
 				AND p.sub_type= #{query.subType}
 			</if>
+			 <if test="query.subjectLocation != null and query.subjectLocation != ''">
+		        AND p.sub_location = #{query.subjectLocation}
+			 </if>
 			<if test="query.userNames != null">
 				AND su.realname like CONCAT('%',#{query.userNames},'%')
 			</if>