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

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

@@ -26,4 +26,8 @@ public interface TabHaobanExternalClerkRelatedMapper {
 	void delByClerkIdAndStaffId(@Param("clerkId")String clerkId, @Param("staffId")String staffId);
 
 	void cleanStaffRelated(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("staffIds")List<String> staffIds);
+
+	TabHaobanExternalClerkRelated getByParams(@Param("userId")String userId, @Param("wxEnterpriseId")String wxEnterpriseId, @Param("name")String name, @Param("createTime")String createTime);
+
+	List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(@Param("externalUserid")String externalUserid, @Param("userId")String wxUserId);
 }
\ No newline at end of file

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

@@ -15,4 +15,10 @@ public interface ExternalClerkRelatedService {
 
 	void cleanStaffRelated(String wxEnterpriseId, List<String> staffIds);
 
+	void update(TabHaobanExternalClerkRelated exsitDTO);
+
+	TabHaobanExternalClerkRelated getByParams(String userId, String wxEnterpriseId, String name, String createTime);
+
+	List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId);
+
 }

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

@@ -24,7 +24,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
 		String clerkId = related.getClerkId();
 		String externalUserId = related.getExternalUserId();
 		TabHaobanExternalClerkRelated tab = mapper.selectByClerkIdAndExternalUserId(clerkId,externalUserId);
-		if(tab != null){
+		if(tab == null){
 			String uuId = StringUtil.randomUUID();
 			related.setExternalClerkRelatedId(uuId);
 			related.setCreateTime(new Date());
@@ -54,4 +54,22 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
 		
 	}
 
+	@Override
+	public void update(TabHaobanExternalClerkRelated exsitDTO) {
+		exsitDTO.setUpdateTime(new Date());
+		mapper.updateByPrimaryKeySelective(exsitDTO);
+		
+	}
+
+	@Override
+	public TabHaobanExternalClerkRelated getByParams(String userId, String wxEnterpriseId, String name,
+			String createTime) {
+		return mapper.getByParams(userId, wxEnterpriseId,name,createTime);
+	}
+
+	@Override
+	public List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId) {
+		return mapper.listByExTernalUseridAndWxUserId(externalUserid,wxUserId);
+	}
+
 }

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

@@ -296,7 +296,7 @@
     set status_flag = 0,
     update_time = now() 
     where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
-    and staff_id in #{wxUserId}
+    and staff_id in 
     <foreach collection="staffIds" item="id" index="index" open="(" close=")" separator=",">
       #{id,jdbcType=VARCHAR}
     </foreach>

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

@@ -261,4 +261,25 @@
     </foreach>
     and status_flag = 1
   </update>
+  
+  <select id="getByParams" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_external_clerk_related
+    where clerk_id = #{clerkId,jdbcType=VARCHAR}
+    and wx_user_id = #{wxUserId}
+    and wx_enterprise_id = #{wxEnterpriseId}
+    and external_name = #{name}
+    and add_create_time = #{createTime}
+    and status_flag = 1
+  </select>
+  
+  <select id="listByExTernalUseridAndWxUserId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_external_clerk_related
+    where wx_user_id = #{userId,jdbcType=VARCHAR}
+    and wx_enterprise_id = #{wxEnterpriseId}
+    and status_flag = 1
+  </select>
 </mapper>
\ No newline at end of file