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

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

@@ -75,7 +75,13 @@ public interface StaffClerkRelationApiService {
 	 * @return
 	 */
 	StaffClerkRelationDTO getByClerkId(String clerkId);
-	
+	/**
+	 * 
+	 * @param enterpriseId
+	 * @param wxUserId
+	 * @return
+	 */
+	List<StaffClerkRelationDTO> listByEnterpriseIdAndWxUserId(String enterpriseId,String wxUserId);
 	/**
 	 * 删除关联关系
 	 * @param clerkId

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

@@ -5,6 +5,7 @@ import java.util.Set;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
 
 public interface TabHaobanStaffClerkRelationMapper {
@@ -76,4 +77,6 @@ public interface TabHaobanStaffClerkRelationMapper {
 	int delByPrimaryKey(@Param("staffClerkRelationId")String staffClerkRelationId);
 	
 	void delByClerkId(@Param("clerkId")String clerkId);
+	
+	List<TabHaobanStaffClerkRelation>listByEnterpriseIdAndWxUserId(@Param("enterpriseId")String enterpriseId,@Param("wxUserId")String wxUserId);
 }
\ No newline at end of file

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

@@ -23,6 +23,7 @@ import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -221,4 +222,9 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 	public void delByClerkId(String clerkId) {
 		tabHaobanStaffClerkRelationMapper.delByClerkId(clerkId);
 	}
+	@Override
+	public List<StaffClerkRelationDTO> listByEnterpriseIdAndWxUserId(String enterpriseId,String wxUserId) {
+		List<TabHaobanStaffClerkRelation> list = tabHaobanStaffClerkRelationMapper.listByEnterpriseIdAndWxUserId(enterpriseId,wxUserId);
+		return  EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, list);
+	}
 }

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

@@ -329,4 +329,13 @@
     	  and status_flag =1
   </update>
   
+    <select id="listByEnterpriseIdAndWxUserId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from tab_haoban_staff_clerk_relation
+    where 
+    enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
+    and wx_user_id = #{wxUserId}
+  </select>
+  
 </mapper>
\ No newline at end of file