diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java index 01b850780a..96085b2a3b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java @@ -65,6 +65,7 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl page(Map params) { + params.put("customerId", loginUserUtil.getLoginUserCustomerId()); IPage page = getPage(params); List list = baseDao.getDeathList(params); return new PageData<>(list, page.getTotal()); @@ -72,6 +73,7 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl list(Map params) { + params.put("customerId", loginUserUtil.getLoginUserCustomerId()); List entityList = baseDao.selectList(getWrapper(params)); return ConvertUtils.sourceToTarget(entityList, ChangeDeathDTO.class); @@ -84,6 +86,7 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -92,6 +95,7 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl page(Map params) { + params.put("customerId", loginUserUtil.getLoginUserCustomerId()); IPage page = getPage(params); List list = baseDao.getRelocationList(params); return new PageData<>(list, page.getTotal()); @@ -80,6 +81,7 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl list(Map params) { + params.put("customerId", loginUserUtil.getLoginUserCustomerId()); List entityList = baseDao.selectList(getWrapper(params)); return ConvertUtils.sourceToTarget(entityList, ChangeRelocationDTO.class); @@ -98,6 +100,7 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); @@ -113,6 +116,7 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl page(Map params) { + params.put("customerId", loginUserUtil.getLoginUserCustomerId()); IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) @@ -57,6 +58,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl list(Map params) { + params.put("customerId", loginUserUtil.getLoginUserCustomerId()); List entityList = baseDao.selectList(getWrapper(params)); return ConvertUtils.sourceToTarget(entityList, ChangeWelfareDTO.class); @@ -69,6 +71,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -77,6 +80,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl + AND d.CUSTOMER_ID = #{customerId} + AND d.GRID_ID = #{gridId} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml index e62db8185a..1bb60fa0a2 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml @@ -44,6 +44,9 @@ AND w.DEL_FLAG = '0' WHERE r.DEL_FLAG = '0' + + AND r.CUSTOMER_ID = #{customerId} + AND r.AGENCY_ID = #{gridId}