From f846648ee33e2568920964dd52fcd290fbc5d271 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 31 May 2022 15:57:32 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcPartyMemberPointServiceImpl.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java index b5e7471213..ca72c7feeb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java @@ -83,11 +83,24 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl 0) { - dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint()); + if(StringUtils.isEmpty(dto.getWarnPoint().toString())) { + if (dto.getWarnPoint() > 0) { + dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint()); + } else { + dto.setTotalScore(dto.getTotalScore() + dto.getWarnPoint()); + } } else { - dto.setTotalScore(dto.getTotalScore() + dto.getWarnPoint()); + dto.setWarnPoint(NumConstant.ZERO); } IcPartyMemberPointEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberPointEntity.class); if(dto.getYear().equals(Year.now().toString())){ From 63efac033c0001a2c968cf1b3deb2947ae190c71 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 31 May 2022 16:32:41 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyMemberPointServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java index ca72c7feeb..a0cf982bb4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java @@ -83,17 +83,17 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl 0) { dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint()); } else { From d7b3dc11713000df5a364cf2bd01e09b3810c473 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 31 May 2022 17:19:00 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC0=E7=AD=89?= =?UTF-8?q?=E7=AD=89=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partymember/IcPartyMemberPointDTO.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java index 1663f19881..4d299c24e0 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java @@ -44,7 +44,7 @@ public class IcPartyMemberPointDTO implements Serializable { /** * 基础积分分值 */ - private Integer basePoint; + private Integer basePoint = 0; /** * 基础积分选项 英文逗号隔开 @@ -54,7 +54,7 @@ public class IcPartyMemberPointDTO implements Serializable { /** * 民主评议积分分值 */ - private Integer reviewPoint; + private Integer reviewPoint = 0; /** * 民主评议积分选项 @@ -64,7 +64,7 @@ public class IcPartyMemberPointDTO implements Serializable { /** * 激励积分分值 */ - private Integer inspirePoint; + private Integer inspirePoint = 0; /** * 激励积分选项 @@ -74,7 +74,7 @@ public class IcPartyMemberPointDTO implements Serializable { /** * 警示扣分分值 */ - private Integer warnPoint; + private Integer warnPoint = 0; /** * 警示扣分选项 @@ -84,7 +84,7 @@ public class IcPartyMemberPointDTO implements Serializable { /** * 总分 */ - private Integer totalScore; + private Integer totalScore = 0; /** * 删除标识：0.未删除 1.已删除 From 04b39e176823c74b00e61ba2aa616e79f96a009d Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 31 May 2022 17:28:25 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyMemberPointServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java index a0cf982bb4..d89811d029 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java @@ -83,17 +83,17 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl 0) { dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint()); } else { From 846a8a281b8429760346bba3bd9e568d2c96fdb6 Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 1 Jun 2022 09:08:53 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partymember/IcPartyMemberPointDTO.java | 8 ++++---- .../service/impl/IcPartyMemberPointServiceImpl.java | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java index 4d299c24e0..90879a74f4 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java @@ -44,7 +44,7 @@ public class IcPartyMemberPointDTO implements Serializable { /** * 基础积分分值 */ - private Integer basePoint = 0; + private Integer basePoint; /** * 基础积分选项 英文逗号隔开 @@ -54,7 +54,7 @@ public class IcPartyMemberPointDTO implements Serializable { /** * 民主评议积分分值 */ - private Integer reviewPoint = 0; + private Integer reviewPoint; /** * 民主评议积分选项 @@ -64,7 +64,7 @@ public class IcPartyMemberPointDTO implements Serializable { /** * 激励积分分值 */ - private Integer inspirePoint = 0; + private Integer inspirePoint; /** * 激励积分选项 @@ -74,7 +74,7 @@ public class IcPartyMemberPointDTO implements Serializable { /** * 警示扣分分值 */ - private Integer warnPoint = 0; + private Integer warnPoint; /** * 警示扣分选项 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java index d89811d029..ae25295b44 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java @@ -83,17 +83,17 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl 0) { dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint()); } else { From a183ef5e4fba752b1c2c1ae83da5b4a794f77a36 Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 1 Jun 2022 09:42:50 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9set=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/service/impl/IcPartyMemberPointServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java index ae25295b44..7a98e0f328 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java @@ -87,7 +87,7 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl Date: Wed, 1 Jun 2022 09:46:35 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcPartyMemberPointServiceImpl.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java index 7a98e0f328..77e92a2eb7 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java @@ -112,11 +112,24 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl 0) { - dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint()); + if(dto.getWarnPoint() != null) { + if (dto.getWarnPoint() > 0) { + dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint()); + } else { + dto.setTotalScore(dto.getTotalScore() + dto.getWarnPoint()); + } } else { - dto.setTotalScore(dto.getTotalScore() + dto.getWarnPoint()); + dto.setWarnPoint(NumConstant.ZERO); } IcPartyMemberPointEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberPointEntity.class); if(dto.getYear().equals(Year.now().toString())){ From a139a36a5566965a65cf66b6a95ae01be24ee0cb Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 1 Jun 2022 10:18:11 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=8F=E5=8C=96?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=BB=9F=E8=AE=A1=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/IcPartyMemberPointDao.java | 5 ++ .../impl/IcPartyMemberPointServiceImpl.java | 55 ++++++++++--------- .../partymember/IcPartyMemberPointDao.xml | 11 ++++ 3 files changed, 46 insertions(+), 25 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java index f7a36ea435..12e8ea95dc 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java @@ -42,4 +42,9 @@ public interface IcPartyMemberPointDao extends BaseDao @Param("customerId") String customerId); void updateMember(@Param("partyMemberId") String partyMemberId, @Param("totalScore") Integer totalScore); + + boolean getPoint(@Param("year") String year, + @Param("quarter") String quarter, + @Param("customerId") String customerId, + @Param("partyMemberId") String partyMemberId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java index 77e92a2eb7..b28ef1727e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java @@ -83,17 +83,17 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl 0) { dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint()); } else { @@ -103,7 +103,7 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl 0) { - dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint()); + if (baseDao.getPoint(dto.getYear(), dto.getQuarter(), dto.getCustomerId(), dto.getPartyMemberId())) { + if (dto.getBasePoint() == null) { + dto.setBasePoint(NumConstant.ZERO); + } + if (dto.getReviewPoint() == null) { + dto.setReviewPoint(NumConstant.ZERO); + } + if (dto.getInspirePoint() == null) { + dto.setInspirePoint(NumConstant.ZERO); + } + dto.setTotalScore(dto.getBasePoint() + dto.getInspirePoint() + dto.getReviewPoint()); + if (dto.getWarnPoint() != null) { + if (dto.getWarnPoint() > 0) { + dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint()); + } else { + dto.setTotalScore(dto.getTotalScore() + dto.getWarnPoint()); + } } else { - dto.setTotalScore(dto.getTotalScore() + dto.getWarnPoint()); + dto.setWarnPoint(NumConstant.ZERO); } + IcPartyMemberPointEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberPointEntity.class); + if (dto.getYear().equals(Year.now().toString())) { + baseDao.updateMember(dto.getPartyMemberId(), dto.getTotalScore()); + } + updateById(entity); } else { - dto.setWarnPoint(NumConstant.ZERO); + save(dto); } - IcPartyMemberPointEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberPointEntity.class); - if(dto.getYear().equals(Year.now().toString())){ - baseDao.updateMember(dto.getPartyMemberId(), dto.getTotalScore()); - } - updateById(entity); + } @Override diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml index 3876ddf432..12ffe7a854 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml @@ -154,6 +154,17 @@ a.total_score ASC, a.CREATED_TIME + \ No newline at end of file From 9da96bc9acaafcf5c0926b75e6782e203b98463e Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 1 Jun 2022 10:30:32 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/partymember/dao/IcPartyMemberPointDao.java | 2 +- .../service/impl/IcPartyMemberPointServiceImpl.java | 2 +- .../resources/mapper/partymember/IcPartyMemberPointDao.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java index 12e8ea95dc..9e44e7d2b6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java @@ -43,7 +43,7 @@ public interface IcPartyMemberPointDao extends BaseDao void updateMember(@Param("partyMemberId") String partyMemberId, @Param("totalScore") Integer totalScore); - boolean getPoint(@Param("year") String year, + int getPoint(@Param("year") String year, @Param("quarter") String quarter, @Param("customerId") String customerId, @Param("partyMemberId") String partyMemberId); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java index b28ef1727e..e17339ad22 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java @@ -112,7 +112,7 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl - SELECT - id + count(id) FROM ic_party_member_point WHERE From cc2a4be89cd598310f585aa6b382987297d23baa Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 1 Jun 2022 10:32:11 +0800 Subject: [PATCH 10/11] sql --- .../main/resources/mapper/partymember/IcPartyMemberPointDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml index c320bf9b25..60fa191f70 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml @@ -164,6 +164,7 @@ AND CUSTOMER_ID = #{customerId} AND YEAR = #{year} AND QUARTER = #{quarter} + AND del_flag = '0' From d95758e09760671ed069c54e2f4f7e4f6f90f988 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 1 Jun 2022 14:20:10 +0800 Subject: [PATCH 11/11] =?UTF-8?q?branchlist=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyOrgServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index b0925ffd7d..789d94bbca 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -23,6 +23,7 @@ import com.epmet.modules.partymember.entity.IcPartyMemberEntity; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -220,7 +221,12 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl orgList = baseDao.selectAllBranchByAgencyId(staffInfo.getAgencyId(),tokenDto.getCustomerId()); + if(CollectionUtils.isEmpty(orgList)){ + return new Result>().ok(resultList); + } + result.setChildren(orgList); resultList.add(result); return new Result>().ok(resultList); }