java/zhihuishenqu.git

			@@ -60,6 +60,12 @@
			<if test="commonPage.departureCity !=null and commonPage.departureCity !=''">
			and departure_city like concat('%',#{commonPage.departureCity},'%')
			</if>
			<if test="commonPage.touristCity !=null and commonPage.touristCity !=''">
			and tourist_city like concat('%',#{commonPage.touristCity},'%')
			</if>
			<if test="commonPage.dangerArea !=null and commonPage.dangerArea !=''">
			and danger_area = #{commonPage.dangerArea}
			</if>
			<if test="commonPage.localCity !=null and commonPage.localCity !='' and commonPage.localCity !='panzhihua'">
			and local_city like concat('%',#{commonPage.localCity},'%')
			</if>
			@@ -107,6 +113,12 @@
			<if test="commonPage.departureCity !=null and commonPage.departureCity !=''">
			and departure_city like concat('%',#{commonPage.departureCity},'%')
			</if>
			<if test="commonPage.touristCity !=null and commonPage.touristCity !=''">
			and tourist_city like concat('%',#{commonPage.touristCity},'%')
			</if>
			<if test="commonPage.dangerArea !=null and commonPage.dangerArea !=''">
			and danger_area = #{commonPage.dangerArea}
			</if>
			<if test="commonPage.localCity !=null and commonPage.localCity !='' and commonPage.localCity !='panzhihua'">
			and local_city like concat('%',#{commonPage.localCity},'%')
			</if>

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -65,4 +65,6 @@
			@ApiModelProperty("登录的账号名")
			private String loginAccount;
			private Integer type;
			private String dangerArea;
			private String touristCity;
			}