diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvMaintainRecordController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvMaintainRecordController.java index 14f92b5..0ba3235 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvMaintainRecordController.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvMaintainRecordController.java @@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.entity.SurvMaintainRecord; import org.jeecg.common.util.R; import org.jeecg.system.applet.service.ISurvMaintainRecordService; +import org.jeecg.system.applet.util.TenantUtil; import org.jeecg.system.applet.util.ThirdSessionHolder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -49,6 +50,8 @@ public class SurvMaintainRecordController { HttpServletRequest req) { // QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(survMaintainRecord, req.getParameterMap()); Page page = new Page(pageNo, pageSize); + String tenantId = TenantUtil.getCurTenant(null); + survMaintainRecord.setTenantId(tenantId); IPage pageList = survMaintainRecordService.pages(page, survMaintainRecord); return R.ok(pageList); } diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvFecesLedgerMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvFecesLedgerMapper.xml index 80acc4e..60214e6 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvFecesLedgerMapper.xml +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvFecesLedgerMapper.xml @@ -45,6 +45,9 @@ and FARM_NAME like concat('%',#{param2.farmName},'%') + + and TENANT_ID = #{param2.tenantId} + order by CREATE_TIME DESC \ No newline at end of file diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvMaintainRecordMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvMaintainRecordMapper.xml index 31b4022..29bee97 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvMaintainRecordMapper.xml +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvMaintainRecordMapper.xml @@ -43,6 +43,9 @@ and DATE_FORMAT(MAINTAIN_TIME, '%Y-%m-%d') = DATE_FORMAT(#{param2.maintainTime},'%Y-%m-%d') + + and TENANT_ID = #{param2.tenantId} + order by MAINTAIN_TIME desc,CREATE_TIME desc \ No newline at end of file diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvMulchRecordMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvMulchRecordMapper.xml index 551046d..d579c4b 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvMulchRecordMapper.xml +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvMulchRecordMapper.xml @@ -41,5 +41,8 @@ and DATE_FORMAT(samp_time,'%Y-%m-%d') = DATE_FORMAT(#{param2.sampTime},'%Y-%m-%d') + + and TENANT_ID = #{param2.tenantId} + \ No newline at end of file