test

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

@@ -12,6 +12,7 @@ import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
@@ -142,7 +143,7 @@ public class GroupChatPlanController {
     }
 
     @RequestMapping("detail")
-    public RestResponse<Object> detail(Long planId) {
+    public RestResponse<Object> detail(Long planId , @RequestParam(defaultValue="0")int updteFlag) {
         ServiceResponse<GroupChatPlanDTO> linkResp = this.groupChatPlanApiService.detail(planId);
         if (!linkResp.isSuccess()) {
             return RestResponse.failure("1", "计划不存在");
@@ -157,17 +158,17 @@ public class GroupChatPlanController {
             materialIdList.add(json.getString("relation_id"));
         }
         // 查询素材列表
+        GroupChatPlanVO vo = EntityUtil.changeEntityByJSON(GroupChatPlanVO.class, plan);
         List<MaterialDTO> materials = materialApiService.listMaterialByIds(materialIdList);
-        
+        vo.setMaterialIdList(materials);
         GroupChatPlanSearchQDTO qdto = new GroupChatPlanSearchQDTO() ;
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
+        qdto.setEnterpriseId(loginUser.getEnterpriseId());
         BasePageInfo basePageInfo = new BasePageInfo();
         basePageInfo.setPageNum(1);
         basePageInfo.setPageNum(10000);
         ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> ownerResp = this.groupChatPlanApiService.listOwnerLogPage(planId, qdto, basePageInfo) ;
-        GroupChatPlanVO vo = EntityUtil.changeEntityByJSON(GroupChatPlanVO.class, plan);
-        vo.setMaterialIdList(materials);
         if(ownerResp.isSuccess()) {
             List<GroupChatPlanOwnerLogDTO> list = ownerResp.getResult().getResult() ;
             List<ChatOwnerVO> ownerList = list.stream().map(dto->{