Merge branch 'feature/社群' into 'developer'

通过导购查询

See merge request !812

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/GroupChatPlanSearchQDTO.java

@@ -27,7 +27,16 @@ public class GroupChatPlanSearchQDTO implements Serializable {
     private Long ownLogId ;
     private List<String> creatorIdList ;
     private String wxChatId;
+    private String searchClerkId ;
     
+    public String getSearchClerkId() {
+        return searchClerkId;
+    }
+
+    public void setSearchClerkId(String searchClerkId) {
+        this.searchClerkId = searchClerkId;
+    }
+
     public String getWxChatId() {
         return wxChatId;
     }

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

@@ -17,23 +17,10 @@ public interface TabQywxErrorLogMapper {
 
     /**
      * 新增数据
-     *
-     * @param tabQywxErrorLog 选项卡qywx错误日志
-     * @return int
-     * @author mozhu
-     * @date 2022-04-18 16:18:25
      */
     int insert(TabQywxErrorLog tabQywxErrorLog);
 
     /**
-     * 通过主键删除数据
-     *
-     * @param id 主键
-     * @return 影响行数
-     */
-    int deleteById(Long id);
-
-    /**
      * 通过ID查询单条数据
      *
      * @param id 主键

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

@@ -211,6 +211,9 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe
             storeId = clerk.getStoreId();
             clerkId = null;
             qdto.setClerkId(null);
+            if (StringUtils.isNotBlank(qdto.getSearchClerkId())) {
+                qdto.setClerkId(qdto.getSearchClerkId());
+            }
         }
         qdto.setStoreId(storeId);
         List<GroupChatPlanOwnerLogDTO> list = this.groupChatPlanOwnerLogMapper.listOwnerLogPageForWxa(qdto);
@@ -236,13 +239,14 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe
                 GroupChatPlanOwnerLogDTO.class);
         return retPage;
     }
-    
+
     @Override
     public GroupChatPlanOwnerLogDTO getOwnerInfo(Long planId, String staffId, String clerkId, String wxEnterpriseId) {
-        GroupChatPlanOwnerLogDTO dto = this.groupChatPlanOwnerLogMapper.getOwnerInfo(planId,staffId,clerkId,wxEnterpriseId) ; 
-        if(null != dto && StringUtils.isNotBlank(dto.getClerkId())) {
-           ClerkDTO clerk =  this.clerkService.getclerkById(dto.getClerkId());
-           dto.setClerkName(clerk.getClerkName());
+        GroupChatPlanOwnerLogDTO dto = this.groupChatPlanOwnerLogMapper.getOwnerInfo(planId, staffId, clerkId,
+                wxEnterpriseId);
+        if (null != dto && StringUtils.isNotBlank(dto.getClerkId())) {
+            ClerkDTO clerk = this.clerkService.getclerkById(dto.getClerkId());
+            dto.setClerkName(clerk.getClerkName());
         }
         return dto;
     }

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

@@ -88,13 +88,6 @@
     </insert>
 
 
-    <!--通过主键删除-->
-    <delete id="deleteById">
-        delete
-        from tab_qywx_error_log
-        where id = #{id}
-    </delete>
-
     <!--查询单个-->
     <select id="queryById" resultMap="TabQywxErrorLogMap">
         select