Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java

@@ -65,6 +65,7 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl<ChangeDeathDao, Chan
 
     @Override
     public PageData<ChangeDeathDTO> page(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         IPage<ChangeDeathDTO> page = getPage(params);
         List<ChangeDeathDTO> list = baseDao.getDeathList(params);
         return new PageData<>(list, page.getTotal());
@@ -72,6 +73,7 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl<ChangeDeathDao, Chan
 
     @Override
     public List<ChangeDeathDTO> list(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         List<ChangeDeathEntity> entityList = baseDao.selectList(getWrapper(params));
 
         return ConvertUtils.sourceToTarget(entityList, ChangeDeathDTO.class);
@@ -84,6 +86,7 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl<ChangeDeathDao, Chan
         String mobile = (String) params.get("mobile");
         String startTime = (String) params.get("startTime");
         String endTime = (String) params.get("endTime");
+        String customerId = (String) params.get("customerId");
 
         QueryWrapper<ChangeDeathEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -92,6 +95,7 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl<ChangeDeathDao, Chan
         wrapper.eq(StringUtils.isNotBlank(mobile), "MOBILE", mobile);
         wrapper.ge(StringUtils.isNotBlank(startTime), "DEATH_DATE", startTime);
         wrapper.le(StringUtils.isNotBlank(endTime), "DEATH_DATE", endTime);
+        wrapper.eq(StringUtils.isNotBlank(customerId), "CUSTOMER_ID", customerId);
 
         return wrapper;
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java

@@ -73,6 +73,7 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
 
     @Override
     public PageData<ChangeRelocationDTO> page(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         IPage<ChangeRelocationDTO> page = getPage(params);
         List<ChangeRelocationDTO> list = baseDao.getRelocationList(params);
         return new PageData<>(list, page.getTotal());
@@ -80,6 +81,7 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
 
     @Override
     public List<ChangeRelocationDTO> list(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         List<ChangeRelocationEntity> entityList = baseDao.selectList(getWrapper(params));
 
         return ConvertUtils.sourceToTarget(entityList, ChangeRelocationDTO.class);
@@ -98,6 +100,7 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
         String buildId = (String) params.get("buildId");
         String unitId = (String) params.get("unitId");
         String homeId = (String) params.get("homeId");
+        String customerId = (String) params.get("customerId");
 
 
         QueryWrapper<ChangeRelocationEntity> wrapper = new QueryWrapper<>();
@@ -113,6 +116,7 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
         wrapper.eq(StringUtils.isNotBlank(buildId), "BUILD_ID", buildId);
         wrapper.eq(StringUtils.isNotBlank(unitId), "UNIT_ID", unitId);
         wrapper.eq(StringUtils.isNotBlank(homeId), "HOME_ID", homeId);
+        wrapper.eq(StringUtils.isNotBlank(customerId), "CUSTOMER_ID", customerId);
 
         return wrapper;
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java

@@ -48,6 +48,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
 
     @Override
     public PageData<ChangeWelfareDTO> page(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         IPage<ChangeWelfareEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
@@ -57,6 +58,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
 
     @Override
     public List<ChangeWelfareDTO> list(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         List<ChangeWelfareEntity> entityList = baseDao.selectList(getWrapper(params));
 
         return ConvertUtils.sourceToTarget(entityList, ChangeWelfareDTO.class);
@@ -69,6 +71,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
         String mobile = (String) params.get("mobile");
         String startTime = (String) params.get("startTime");
         String endTime = (String) params.get("endTime");
+        String customerId = (String) params.get("customerId");
 
         QueryWrapper<ChangeWelfareEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -77,6 +80,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
         wrapper.eq(StringUtils.isNotBlank(mobile), "MOBILE", mobile);
         wrapper.ge(StringUtils.isNotBlank(startTime), "JOIN_DATE", startTime);
         wrapper.le(StringUtils.isNotBlank(endTime), "JOIN_DATE", endTime);
+        wrapper.eq(StringUtils.isNotBlank(customerId), "CUSTOMER_ID", customerId);
 
         return wrapper;
     }

epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml

@@ -33,6 +33,9 @@
             AND w.DEL_FLAG = '0'
         WHERE
             d.DEL_FLAG = '0'
+        <if test="customerId != null and customerId != ''">
+            AND d.CUSTOMER_ID = #{customerId}
+        </if>
         <if test="gridId != null and gridId != ''">
             AND d.GRID_ID = #{gridId}
         </if>

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'
+        <if test="customerId != null and customerId != ''">
+            AND r.CUSTOMER_ID = #{customerId}
+        </if>
         <if test="gridId != null and gridId != ''">
             AND r.AGENCY_ID = #{gridId}
         </if>