Browse Source

🐞 fix: 修复工单接口存在的部分问题

Pchen. 9 months ago
parent
commit
b259fe0344

+ 1 - 0
apis/Kefu/Order/Admin/GetOrderList.js

@@ -55,6 +55,7 @@ class GetOrderList extends API {
                 a.id,
                 a.id,
                 a.title,
                 a.title,
                 a.state,
                 a.state,
+                a.email,
                 a.create_time,
                 a.create_time,
                 a.update_time,
                 a.update_time,
                 u.username,
                 u.username,

+ 4 - 4
apis/Kefu/Order/CloseOrder.js

@@ -34,8 +34,8 @@ class CloseOrder extends API {
             type: 'system'
             type: 'system'
         }
         }
 
 
-        const selectSql = 'SELECT msg, state, create_user FROM work_order WHERE id = ? AND create_user = ?'
-        const selectRows = await db.query(selectSql, [id, uuid])
+        const selectSql = 'SELECT msg, state, create_user FROM work_order WHERE id = ?'
+        const selectRows = await db.query(selectSql, [id])
         if (!selectRows || selectRows.length !== 1 || selectRows[0].state === 2)
         if (!selectRows || selectRows.length !== 1 || selectRows[0].state === 2)
             return res.json({
             return res.json({
                 ...BaseStdResponse.ERR,
                 ...BaseStdResponse.ERR,
@@ -51,8 +51,8 @@ class CloseOrder extends API {
         msg = selectRows[0].msg
         msg = selectRows[0].msg
         msg.push(systemMsg)
         msg.push(systemMsg)
 
 
-        let sql = 'UPDATE work_order SET msg = ?, update_time = ?, state = 2 WHERE id = ? AND create_user = ?'
-        let r = await db.query(sql, [msg, time, id, uuid])
+        let sql = 'UPDATE work_order SET msg = ?, update_time = ?, state = 2 WHERE id = ?'
+        let r = await db.query(sql, [msg, time, id])
 
 
         try {
         try {
             if (r && r.affectedRows > 0) {
             if (r && r.affectedRows > 0) {

+ 1 - 1
plugin/Email/emailTemplate.js

@@ -625,9 +625,9 @@ class emailTemplate {
                     <p>您编号为${data.id}的工单有新的回复:</p>
                     <p>您编号为${data.id}的工单有新的回复:</p>
                     <div class="info">
                     <div class="info">
                         <p><strong>回复内容:</strong> ${data.content}</p>
                         <p><strong>回复内容:</strong> ${data.content}</p>
-                        <p><strong>附件数量:</strong> ${data.files.length}</p>
                         <p><strong>回复时间:</strong> ${this.stramptoTime(new Date().getTime())}</p>
                         <p><strong>回复时间:</strong> ${this.stramptoTime(new Date().getTime())}</p>
                     </div>
                     </div>
+                    <p class="important">${data.files.length > 0 ? '当前回复内含有附件,请前往网站内查看' : ''}</p>
                     <p class="important">请前往RunForge官网回复工单,请勿直接回复邮件。</p>
                     <p class="important">请前往RunForge官网回复工单,请勿直接回复邮件。</p>
                     <p class="footer">Copyright © 2025 RunForge</p>
                     <p class="footer">Copyright © 2025 RunForge</p>
                 </div>
                 </div>