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

Feature/社群

See merge request !795

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

@@ -176,9 +176,12 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe
     @Override
     public Page<ChatOwnerTotalDTO> listOwnerLogPageForWxaTotal(GroupChatPlanSearchQDTO qdto,
             BasePageInfo basePageInfo) {
-        PageHelper.startPage(basePageInfo);
         String clerkId = qdto.getClerkId();
         ClerkDTO clerk = this.clerkService.getclerkById(clerkId);
+        if(null == clerk) {
+            logger.info("导购不存在");
+            return new Page<ChatOwnerTotalDTO>();
+        }
         int clerkType = clerk.getClerkType();
         String storeId = null;
         if (clerkType == 1) {
@@ -186,6 +189,7 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe
             clerkId = null;
         }
         qdto.setStoreId(storeId);
+        PageHelper.startPage(basePageInfo);
         List<ChatOwnerTotalDTO> list = this.groupChatPlanOwnerLogMapper.listOwnerLogPageForWxaTotal(qdto);
         Page<ChatOwnerTotalDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, ChatOwnerTotalDTO.class);
         return retPage;

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanOwnerLogMapper.xml

@@ -167,6 +167,7 @@
   	  	<if test="null != sendStatus">
   	  		and a.send_status = #{sendStatus}
   	  	</if>
+  	  	order by a.create_time desc , a.owner_log_id
   	  	group by b.plan_id
   </select>
   
@@ -195,6 +196,10 @@
   	  	<if test="null != clerkId">
   	  		and a.clerk_id = #{clerkId}
   	  	</if>
+  	  	<if test="null != sendStatus">
+  	  		and a.send_status = #{sendStatus}
+  	  	</if>
+  	  	 order by a.create_time desc , a.owner_log_id
   </select>
   
 </mapper> 
\ No newline at end of file

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

@@ -49,6 +49,9 @@ public class GroupChatPlanController {
     @RequestMapping("total-list")
     public RestResponse<Object> totalList(String clerkId, String wxEnterpriseId, String enterpriseId,
             String searchParams, BasePageInfo basePageInfo) {
+        if (StringUtils.isEmpty(clerkId)) {
+            return RestResponse.failure("1", "clerkId为空");
+        }
         GroupChatPlanSearchQDTO qdto = new GroupChatPlanSearchQDTO();
         qdto.setWxEnterpriseId(wxEnterpriseId);
         qdto.setEnterpriseId(enterpriseId);
@@ -73,6 +76,9 @@ public class GroupChatPlanController {
 
     @RequestMapping("owner-list")
     public RestResponse<Object> ownerList(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
+        if (null == qdto.getPlanId()) {
+            return RestResponse.failure("1", "planid为空");
+        }
         ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> page = this.groupChatPlanApiService.listOwnerLogPageForWxa(qdto,
                 basePageInfo);
         return RestResponse.successResult(page.getResult());
@@ -86,6 +92,9 @@ public class GroupChatPlanController {
 
     @RequestMapping("detail")
     public RestResponse<Object> detail(Long planId) {
+        if (null == planId) {
+            return RestResponse.failure("1", "planid为空");
+        }
         ServiceResponse<GroupChatPlanDTO> linkResp = this.groupChatPlanApiService.detail(planId);
         if (!linkResp.isSuccess() || null == linkResp.getResult()) {
             return RestResponse.failure("1", "计划不存在");
@@ -109,6 +118,9 @@ public class GroupChatPlanController {
     @RequestMapping("owner-do-list")
     public RestResponse<Object> ownerDoList(Long planId, String clerkId, String wxEnterpriseId, String enterpriseId,
             Long ownLogId, BasePageInfo basePageInfo) {
+        if (null == ownLogId || null == planId || StringUtils.isEmpty(clerkId)) {
+            return RestResponse.failure("1", "参数未传");
+        }
         GroupChatPlanSearchQDTO qdto = new GroupChatPlanSearchQDTO();
         qdto.setWxEnterpriseId(wxEnterpriseId);
         qdto.setEnterpriseId(enterpriseId);