From 0d368fee20b005cf12c2feb35780c69c2c75cdda Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 15 十月 2021 16:17:47 +0800
Subject: [PATCH] 爱心义仓修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseOperationMapper.xml | 3 +++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java | 2 ++
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseOperationApi.java | 1 +
3 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseOperationApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseOperationApi.java
index 62ec020..4b6b3c7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseOperationApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseOperationApi.java
@@ -39,6 +39,7 @@
@ApiOperation(value = "分页",response = ComActWarehouseOperationVO.class)
@PostMapping("queryAll")
public R queryAll(@RequestBody CommonPage commonPage) {
+ commonPage.setCommunityId(this.getCommunityId());
return this.communityService.comActWarehouseOperationSelectAll(commonPage);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
index 2f90297..8a63880 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
@@ -57,4 +57,6 @@
private String position;
@ApiModelProperty("参数id2")
private Integer paramId2;
+ @ApiModelProperty("社区id")
+ private Long communityId;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseOperationMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseOperationMapper.xml
index f09e388..8b2f9ed 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseOperationMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseOperationMapper.xml
@@ -25,6 +25,9 @@
<if test="commonPage.paramId != null">
and t.goods_id=#{commonPage.paramId}
</if>
+ <if test="commonPage.communityId !=null">
+ and t1.community_id =#{communityId}
+ </if>
<if test="commonPage.keyword !=null and commonPage.keyword !=''">
and t1.item like concat('%',#{commonPage.keyword},'%')
</if>
--
Gitblit v1.7.1