Merge pull request #178 from maxincai/master

修复群发消息数据库字段名称错误问题
mochat-cloud · Oct 20, 2021 · 589824f · 589824f
2 parents a637f51 + 91478a8
commit 589824f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/api-server/app/core/work-contact/src/Logic/SyncContactByEmployeeLogic.php b/api-server/app/core/work-contact/src/Logic/SyncContactByEmployeeLogic.php
@@ -112,6 +112,7 @@ public function handle($corpId, $employeeId, string $contactWxExternalUserId, ar
             [$contactId, $isNewContact, $followEmployee] = $this->getContact($corpId, $contactWxExternalUserId, $employeeWxUserId);
 
             if ($contactId === 0) {
+                Db::rollBack();
                 return [$contactId, $isNewContact, $employee];
             }
 

diff --git a/api-server/storage/install/mochat.sql b/api-server/storage/install/mochat.sql
@@ -1952,7 +1952,7 @@ CREATE TABLE IF NOT EXISTS `mc_room_message_batch_send` (
   `definite_time` timestamp NULL DEFAULT NULL COMMENT '定时发送时间',
   `send_time` timestamp NULL DEFAULT NULL COMMENT '发送时间',
   `send_room_total` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '发送成员数量',
-  `send_contact_total` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '发送客户数量',
+  `send_employee_total` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '发送客户数量',
   `send_total` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '已发送数量',
   `not_send_total` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '未发送数量',
   `received_total` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '已送达数量',

diff --git a/api-server/storage/install/upgrade_1.1.5.sql b/api-server/storage/install/upgrade_1.1.5.sql
@@ -0,0 +1 @@
+ALTER TABLE `mc_room_message_batch_send` CHANGE COLUMN `send_contact_total` `send_employee_total` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '发送员工数量' AFTER `send_room_total`;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE `mc_room_message_batch_send` CHANGE COLUMN `send_contact_total` `send_employee_total` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '发送员工数量' AFTER `send_room_total`;