Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-issuer

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/manager/messageWaitSend/MessageWaitSendManagerImpl.java

@@ -7,6 +7,7 @@ import java.util.Map;
 
 import cn.com.taiji.common.pub.BeanTools;
 import cn.com.taiji.core.entity.msgw.MsgwSendApply;
+import cn.com.taiji.core.entity.user.Staff;
 import cn.com.taiji.core.model.comm.protocol.ats.weiXin.WxMiniSendMessageResponse;
 import cn.com.taiji.core.model.comm.protocol.ats.weiXin.WxMpSendMessageResponse;
 import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortResponse;
@@ -216,8 +217,19 @@ public class MessageWaitSendManagerImpl extends AbstractCommManager implements M
         List<MsgwSendDetails> list = new ArrayList<>();
         if (request.getApplyId() != null){
             MsgwSendApply apply = sendApplyRepo.findById(request.getApplyId()).orElse(null);
+            if (apply.getAuditorOpenId() != null){
+                Staff staff = staffRepo.findByOpenId(apply.getAuditorOpenId());
+                if (staff != null){
+                    apply.setAuditorOpenId(staff.getStaffName());
+                }
+            }
             response.setSendApply(apply);
-            list = sendDetailsRepo.findByApplyId(request.getApplyId());
+            if (request.getDetailsId() != null){
+                MsgwSendDetails sendDetails = sendDetailsRepo.findById(request.getDetailsId()).orElse(null);
+                list.add(sendDetails);
+            }else{
+                list = sendDetailsRepo.findByApplyId(request.getApplyId());
+            }
             response.setSendDetails(list);
         }else {
             MsgwSendDetails sendDetails = sendDetailsRepo.findById(request.getDetailsId()).orElse(null);