登录

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

@@ -37,7 +37,7 @@ public interface ExternalClerkRelatedApiService {
 	 *
 	 * @return
 	 */
-	Page<ExternalClerkRelatedDTO> pageExternalClerk(String wxEnterpriseId, String wxUserId, Integer statusFlag, BasePageInfo pageInfo);
+	Page<ExternalClerkRelatedDTO> pageExternalClerk(String wxEnterpriseId, String wxUserId, List<Integer> statusFlags, BasePageInfo pageInfo);
 
 	/**
 	 * 推送外部联系人 更新次数以及状态

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

@@ -66,10 +66,10 @@ public interface TabHaobanExternalClerkRelatedMapper {
 	 *
 	 * @param wxEnterpriseId
 	 * @param wxUserId
-	 * @param statusFlag
+	 * @param statusFlags
 	 * @return
 	 */
-	List<TabHaobanExternalClerkRelated> listByWxEnterpriseIdAndWxUserIdAndStatus(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("wxUserId") String wxUserId, @Param("statusFlag") Integer statusFlag);
+	List<TabHaobanExternalClerkRelated> listByWxEnterpriseIdAndWxUserIdAndStatus(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("wxUserId") String wxUserId, @Param("statusFlags") List<Integer> statusFlags);
 
 	/**
 	 * 触达会员 给会员发送

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

@@ -67,10 +67,10 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
 	}
 
 	@Override
-	public Page<ExternalClerkRelatedDTO> pageExternalClerk(String wxEnterpriseId, String wxUserId, Integer statusFlag, BasePageInfo pageInfo) {
+	public Page<ExternalClerkRelatedDTO> pageExternalClerk(String wxEnterpriseId, String wxUserId, List<Integer> statusFlags, BasePageInfo pageInfo) {
 		PageHelper.startPage(pageInfo);
-		List<TabHaobanExternalClerkRelated> ret = tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserIdAndStatus(wxEnterpriseId, wxUserId, statusFlag);
-        Page<ExternalClerkRelatedDTO> retPage = PageUtil.changePageHelperToCurrentPage(new PageInfo<>(ret), ExternalClerkRelatedDTO.class);
+		List<TabHaobanExternalClerkRelated> ret = tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserIdAndStatus(wxEnterpriseId, wxUserId, statusFlags);
+		Page<ExternalClerkRelatedDTO> retPage = PageUtil.changePageHelperToCurrentPage(new PageInfo<>(ret), ExternalClerkRelatedDTO.class);
         return retPage;
     }
 

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

@@ -400,7 +400,10 @@
     from tab_haoban_external_clerk_related
     where wx_user_id = #{wxUserId,jdbcType=VARCHAR}
     and wx_enterprise_id = #{wxEnterpriseId}
-    and status_flag = #{statusFlag}
+    and status_flag in
+    <foreach collection="statusFlags" item="item" separator="," open="(" close=")">
+      #{item}
+    </foreach>
     order by update_time desc
   </select>
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java

@@ -920,8 +920,15 @@ public class ClerkController extends WebBaseController{
 	 */
 	@RequestMapping("external-friend-list")
 	public HaobanResponse friendList(String staffId, Integer status, BasePageInfo pageInfo) {
+		List<Integer> statusFlags = new ArrayList<>();
+		if (status == null) {
+			statusFlags.add(3);
+			statusFlags.add(4);
+		} else {
+			statusFlags.add(status);
+		}
 		StaffDTO staff = staffApiService.selectById(staffId);
-		Page<ExternalClerkRelatedDTO> page = externalClerkRelatedApiService.pageExternalClerk(staff.getWxEnterpriseId(), staff.getWxUserId(), status, pageInfo);
+		Page<ExternalClerkRelatedDTO> page = externalClerkRelatedApiService.pageExternalClerk(staff.getWxEnterpriseId(), staff.getWxUserId(), statusFlags, pageInfo);
 		PageResult2 retPage = PageUtil.getPageInfo(page);
 		return resultResponse(HaoBanErrCode.ERR_1, retPage);
 	}