From d2056da72dc36ff01170eeba3bd43a33e95b4d9a Mon Sep 17 00:00:00 2001
From: lujiang <ljxuzhou@163.com>
Date: Thu, 10 Oct 2024 22:03:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E5=92=8C=E7=94=A8=E6=88=B7=E7=BB=91=E5=AE=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/admin/IcsCustomerStaffMapper.xml  |  2 +-
 .../ics/service/impl/RepairRemindPushServiceImpl.java  | 10 +++++-----
 .../ics-web/src/main/resources/application-server.yml  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml
index ed22bd1..9dc2cdb 100644
--- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml
+++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml
@@ -244,7 +244,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     <update id="updateGzhOpenid">
         <![CDATA[
-        update ics_customer_staff set gzh_openid = #{openid} where mobile = #{mobile} and delete_flag=0 and gzh_openid is null and data_type is not null and data_type<>'1'
+        update ics_customer_staff set gzh_openid = #{openid} where mobile = #{mobile} and delete_flag=0 and gzh_openid is null and data_type is not null and room_role is not null
         ]]>
     </update>
 
diff --git a/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairRemindPushServiceImpl.java b/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairRemindPushServiceImpl.java
index 4a86450..545f1b1 100644
--- a/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairRemindPushServiceImpl.java
+++ b/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairRemindPushServiceImpl.java
@@ -121,14 +121,14 @@ public class RepairRemindPushServiceImpl implements RepairRemindPushService {
                 }
                 //会议预约模板填充数据
                 if (repairRemind.getTypeId() == 1) {
-                    data.put("time", dataTime);
-                    data.put("thing", msg);
+                    data.put("time6", dataTime);
+                    data.put("thing3", msg);
                 }
                 param.put("data", data);
                 JSONObject result = send(url, JSON.toJSONString(param));
-//                System.out.println("==========ttt1==========");
-//                System.out.println(result.toString());
-//                System.out.println("==========ttt2==========");
+                System.out.println("==========ttt1==========");
+                System.out.println(result.toString());
+                System.out.println("==========ttt2==========");
                 if (result == null || result.getInteger("errcode") == null || result.getInteger("errcode") != 0) {
                     failed.add(repairRemind.getId());
                 } else {
diff --git a/shoot-hand/ics-web/src/main/resources/application-server.yml b/shoot-hand/ics-web/src/main/resources/application-server.yml
index 30f083f..1f22cb7 100644
--- a/shoot-hand/ics-web/src/main/resources/application-server.yml
+++ b/shoot-hand/ics-web/src/main/resources/application-server.yml
@@ -138,4 +138,4 @@ webchatGZH: #微信公众号用户绑定及模板消息推送相关配置
   secret: db375b6db9c7b87b1daa48375b45731e
   access: https://baoxiu.jsgdha.com/shoot-hand #pc后端访问地址
   templateRP: 4jgtzPfyX546n5ZDPHbN69YSSFf8NSOQUDJuPb6bYwA #工单模板消息模板id
-  templateMR: XXX #会议室预约模板消息id
\ No newline at end of file
+  templateMR: erLiOoswMLHXknPpd5UVvSC5C8sIUwlfpgqdVPZhwcA #会议室预约模板消息id
\ No newline at end of file