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

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java

@@ -20,4 +20,8 @@ public interface ExternalClerkRelatedApiService {
 	Page<ExternalClerkRelatedDTO> pageMemberUnionByParams(List<String> userIdList, List<String> sendMemberIds,
 			String enterpriseId, BasePageInfo pageInfo);
 
+	List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserId(String wxUserId, String wxEnterpriseId);
+
+	List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserIds(List<String> userIdList, String wxEnterpriseId);
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java

@@ -37,4 +37,8 @@ public interface TabHaobanExternalClerkRelatedMapper {
 
 	Page<TabHaobanExternalClerkRelated> pageMemberUnionByParams(@Param("userIdList")List<String> userIdList, @Param("sendMemberIds")List<String> sendMemberIds,
 			@Param("enterpriseId")String enterpriseId);
+
+	List<TabHaobanExternalClerkRelated> listByWxEnterpriseIdAndWxUserId(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId);
+
+	List<TabHaobanExternalClerkRelated> listByWxEnterpriseIdAndWxUserIds(@Param("userIdList")List<String> userIdList, @Param("wxEnterpriseId")String wxEnterpriseId);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java

@@ -4,6 +4,8 @@ package com.gic.haoban.manage.service.service.out.impl;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.*;
+
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
@@ -35,5 +37,18 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
 		PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
 		return  PageUtil.changePageHelperToCurrentPage(tabHaobanExternalClerkRelatedMapper.pageMemberUnionByParams(userIdList,sendMemberIds,enterpriseId),ExternalClerkRelatedDTO.class);
 	}
+	@Override
+	public List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserId(String wxUserId, String wxEnterpriseId) {
+		
+		return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserId(wxUserId,wxEnterpriseId));
+	}
+	@Override
+	public List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserIds(List<String> userIdList,
+			String wxEnterpriseId) {
+		if(userIdList == null || userIdList.isEmpty()){
+			return Collections.EMPTY_LIST;
+		}
+		return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserIds(userIdList,wxEnterpriseId));
+	}
 	
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -244,6 +244,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	public String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto) {
 		//拼装参数
 		dto = getMemberUnionidRelatedDTO(dto);
+		if(dto == null){
+			return "";
+		}
 		
 		//新增成员和外部联系人的关系
 		String memberUnionId = insertMemberUnionIdRelated(dto);
@@ -262,7 +265,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		String createTime = dto.getAddCreateTime();
 		String externalUserId = dto.getExternalUserid();
 		String avatar = dto.getAvatar();
-		if(StringUtils.isAnyBlank(wxUserId,wxEnterpriseId,name,createTime,avatar)){
+		if(StringUtils.isAnyBlank(wxUserId,wxEnterpriseId,name,createTime)){
 			log.info("【新增外部联系人】wxUserId={},wxEnterpriseId={},name={},createTime={},avatar={}",wxUserId,wxEnterpriseId,name,createTime,avatar);
 			return;
 		}
@@ -330,6 +333,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		
 	}
 	private String insertMemberUnionIdRelated(MemberUnionidRelatedDTO dto) {
+		if(dto == null){
+			return "";
+		}
 		String wxUserId = dto.getWxUserId();
 		String wxEnterpriseId = dto.getWxEnterpriseId();
 		String name = dto.getExternalName();
@@ -394,6 +400,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		
 		dto.setExternalName(name);
 		dto.setAddCreateTime(createTime);
+		dto.setAvatar(pojo.getAvatar());
 		
 		String externalUserId = null;
 		String selfExternalUserId = null;

haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -311,4 +311,25 @@
     and member_id is not null
     group by external_user_id
   </select>
+  
+   <select id="listByWxEnterpriseIdAndWxUserId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_external_clerk_related
+    where wx_user_id = #{wxUserId,jdbcType=VARCHAR}
+    and wx_enterprise_id = #{wxEnterpriseId}
+    and status_flag = 1
+  </select>
+  
+  <select id="listByWxEnterpriseIdAndWxUserIds" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_external_clerk_related
+    where wx_user_id in 
+    <foreach item="wxUserId" index="index" collection="userIdList" open="(" separator="," close=")">  
+       #{wxUserId, jdbcType=CHAR}  
+    </foreach>
+    and wx_enterprise_id = #{wxEnterpriseId}
+    and status_flag = 1
+  </select>
 </mapper>
\ No newline at end of file