Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java

@@ -11,7 +11,7 @@ public class IcMessageListFormDTO implements Serializable {
 
 	private Integer pageNo = 1;
 	private Integer pageSize = 20;
-	private Boolean isPage = false;
+	private Boolean isPage = true;
 	//token中信息
 	private String customerId;
 	private String userId;

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java

@@ -20,7 +20,7 @@ public class IcPartyActListFormDTO implements Serializable {
 
     private Integer pageNo = 1;
     private Integer pageSize = 20;
-    private Boolean isPage = false;
+    private Boolean isPage = true;
 
     //token中信息
     private String customerId;

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java

@@ -33,7 +33,7 @@ public class PartyActSignFormDTO implements Serializable {
 
     private Integer pageNo = 1;
     private Integer pageSize = 20;
-    private Boolean isPage = false;
+    private Boolean isPage = true;
 
     //token中信息
     private String customerId;

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

@@ -595,7 +595,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
             msgList.add(msg);
         }
         //2-2.给工作人员推送日程消息
-        if ("remind".equals(formDTO.getType())) {
+        if ("notify".equals(formDTO.getType())) {
             UserMessageFormDTO msg = new UserMessageFormDTO();
             msg.setCustomerId(formDTO.getCustomerId());
             msg.setApp(AppClientConstant.APP_GOV);

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

@@ -716,7 +716,11 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
         //1.判断是居民端用户查询其党支部信息
         //根据token判断查询党支部信息和未读消息数，居民端用户根据userId查询partymember_info表关联ic_party_member、ic_party_org查询支部信息，工作段端不用查支部信息
         if ("resi".equals(tokenDto.getApp())) {
-            resultDTO = baseDao.selectByUserId(tokenDto.getUserId());
+            IcPartyInfoResultDTO user = baseDao.selectByUserId(tokenDto.getUserId());
+            if(null != user){
+                resultDTO.setId(user.getId());
+                resultDTO.setPartOrgName(user.getPartOrgName());
+            }
         }
         //2.查询用户未读消息数
         Result<Integer> result = epmetMessageOpenFeignClient.unReadCount(tokenDto.getUserId());