diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index 43457e8458..5b7702d116 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -12,6 +12,13 @@
jar
+
+ com.epmet
+ epmet-heart-client
+
+ 2.0.0
+
+
com.epmet
resi-partymember-client
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java
index 88e1f53606..ed2e25395a 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java
@@ -25,10 +25,8 @@ import com.epmet.resi.partymember.dto.partyOrg.result.LingShanScreenPartyObjectB
import com.epmet.resi.partymember.enums.LingShanPartyObjEnums;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -55,7 +53,7 @@ public class LingShanPartyOrgServiceImpl implements LingShanPartyOrgService, Res
} catch (
Exception e) {
logger.error("【灵山大屏-党对象数量查询】组织未找到:" + agencyId);
- return tl;
+ return convertPartyObjsMap2DTO(null);
}
String orgIdPath = PidUtils.convertPid2OrgIdPath(agencyInfo.getId(), agencyInfo.getPids());
@@ -111,6 +109,20 @@ public class LingShanPartyOrgServiceImpl implements LingShanPartyOrgService, Res
// 4.检查缺项(党委, 支部, 党群服务中心, 党群服务站, 联建单位几项都要有,没有数据则显示0。党代表工作室目前还没开发,开发了也要有)
Map map = tl.stream().collect(Collectors.toMap(LingShanPartyOrgAndOtherObjQtyRstDTO::getName, Function.identity()));
+ return convertPartyObjsMap2DTO(map);
+ }
+
+ /**
+ * @Description: 看看哪个缺了,补上
+ * @param map:
+ * @Return java.util.List
+ * @Author: wangxianzhang
+ * @Date: 2023/5/23 3:43 PM
+ */
+ public List convertPartyObjsMap2DTO(Map map) {
+ if (map == null) {
+ map = new HashMap<>();
+ }
LinkedList rl = new LinkedList();
LingShanPartyOrgAndOtherObjQtyRstDTO dw = map.get("党委");
rl.add(dw != null ? dw : new LingShanPartyOrgAndOtherObjQtyRstDTO(LingShanPartyObjEnums.DW.getCode(), "党委", 0));
@@ -126,7 +138,6 @@ public class LingShanPartyOrgServiceImpl implements LingShanPartyOrgService, Res
LingShanPartyOrgAndOtherObjQtyRstDTO ljdz = map.get("联建单位");
rl.add(ljdz != null ? ljdz : new LingShanPartyOrgAndOtherObjQtyRstDTO(LingShanPartyObjEnums.PARTY_UNIT.getCode(), "联建单位", 0));
-
return rl;
}