From 25b51897bdb5dd81532f448da5d09adf3f790c77 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Apr 2023 17:02:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8D=E6=8C=87=E5=AE=9A=E6=B3=9B?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/service/impl/IcPartyMemberServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index 63718b89cf..d80fa318be 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/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 list = baseDao.getPartyMemberAgeList(formDTO.getAgencyId(), formDTO.getOrgId(), formDTO.getCode()); - PageInfo pageInfo = new PageInfo<>(list); + PageInfo pageInfo = new PageInfo<>(list); List resultDTOList = ConvertUtils.sourceToTarget(list, PartymemberPortraitResultDTO.class); return new PageData<>(resultDTOList, pageInfo.getTotal(), formDTO.getPageSize()); @@ -744,7 +744,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(), formDTO.getOrgId(), formDTO.getCode(),formDTO.getCodeType()); - PageInfo pageInfo = new PageInfo<>(list); + PageInfo pageInfo = new PageInfo<>(list); List resultDTOList = ConvertUtils.sourceToTarget(list, PartymemberPortraitResultDTO.class); return new PageData<>(resultDTOList, pageInfo.getTotal(), formDTO.getPageSize()); From a76231d092cdd67a1cbb87e128226ce7cfc392af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Thu, 20 Apr 2023 18:51:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/StaffLoginLogDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index 32d506c960..357718ab48 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/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