Merge remote-tracking branch 'origin/dev_ic_platform' into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -58,7 +58,8 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                @Param("resultColumns") List<IcFormResColumnDTO> resultColumns,
                                                @Param("subTables") List<String> subTables,
                                                @Param("currentStaffAgencyId")String currentStaffAgencyId,
-                                               @Param("staffOrgPath") String staffOrgPath);
+                                               @Param("staffOrgPath") String staffOrgPath,
+                                               @Param("resultTableName")String resultTableName);
     /**
      * 查询主表
      *

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

@@ -322,7 +322,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     formDTO.getConditions(),
                     resultColumns,
                     subTables,
-                    staffInfoCacheResult.getAgencyId(), finalStaffOrgPath
+                    staffInfoCacheResult.getAgencyId(), finalStaffOrgPath,null
                     ));
         }else{
             List<Map<String,Object>> list=baseDao.selectListResiMap(formDTO.getCustomerId(),
@@ -330,7 +330,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     formDTO.getConditions(),
                     resultColumns,
                     subTables,staffInfoCacheResult.getAgencyId(),
-                    staffOrgPath);
+                    staffOrgPath,null);
             pageInfo.setTotal(CollectionUtils.isEmpty(list)?NumConstant.ZERO:list.size());
             pageInfo.setList(list);
         }