From 88a7811b82be07f2157f660bc8441e5860a35adc Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 15 四月 2022 11:13:35 +0800
Subject: [PATCH] 花城E+防疫修改
---
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java | 4 ++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java
index ed1442c..3d78c3f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java
@@ -16,6 +16,7 @@
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.SFTPUtil;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -70,6 +71,9 @@
@ApiOperation(value = "分页查询",response = ComActAcidRecordVO.class)
@PostMapping("queryAll")
public R selectAll(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) {
+ if(StringUtils.isEmpty(comActAcidRecordDTO.getLocalCity())){
+ comActAcidRecordDTO.setLocalCity(this.getLoginUserInfo().getName());
+ }
return this.communityService.selectAllComActAcidRecord(comActAcidRecordDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml
index e5eb125..1038846 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml
@@ -45,7 +45,7 @@
<if test="commonPage.departureCity !=null and commonPage.departureCity !=''">
and departure_city like concat('%',#{commonPage.departureCity},'%')
</if>
- <if test="commonPage.localCity !=null and commonPage.localCity !=''">
+ <if test="commonPage.localCity !=null and commonPage.localCity !='' and commonPage.localCity !='panzhihua'">
and local_city like concat('%',#{commonPage.localCity},'%')
</if>
</where>
--
Gitblit v1.7.1