Merge branch 'yantai_zhengwu_master' into dev

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml

@@ -92,7 +92,7 @@
         COUNT(DISTINCT(l.STAFF_ID)) accountActivityCount,
         COUNT(DISTINCT(ag.USER_ID)) accountCount,
         a.ID agencyId,
-        a.ALL_PARENT_NAME agencyName
+        CONCAT(a.ALL_PARENT_NAME,a.ORGANIZATION_NAME)  agencyName
         FROM
         customer_agency a
         LEFT JOIN staff_login_log l ON a.ID = l.AGENCY_ID

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java

@@ -735,7 +735,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
         if ("age".equals(formDTO.getCodeType())) {
             PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
             List<PartyMemberAgeResultDTO> list = baseDao.getPartyMemberAgeList(formDTO.getAgencyId(), formDTO.getOrgId(), formDTO.getCode());
-            PageInfo<PartyMemberAgeResultDTO> pageInfo = new PageInfo<>(list);
+            PageInfo pageInfo = new PageInfo<>(list);
 
             List<PartymemberPortraitResultDTO> resultDTOList = ConvertUtils.sourceToTarget(list, PartymemberPortraitResultDTO.class);
             return new PageData<>(resultDTOList, pageInfo.getTotal(), formDTO.getPageSize());
@@ -744,7 +744,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
         // else if ("education".equals(formDTO.getCodeType())) {
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         List<PartyMemberEducationResultDTO> list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(), formDTO.getOrgId(), formDTO.getCode(),formDTO.getCodeType());
-        PageInfo<PartyMemberEducationResultDTO> pageInfo = new PageInfo<>(list);
+        PageInfo pageInfo = new PageInfo<>(list);
 
         List<PartymemberPortraitResultDTO> resultDTOList = ConvertUtils.sourceToTarget(list, PartymemberPortraitResultDTO.class);
         return new PageData<>(resultDTOList, pageInfo.getTotal(), formDTO.getPageSize());