diff --git a/server/src/routes/admin.js b/server/src/routes/admin.js
index aab9765..a2ea4c4 100644
--- a/server/src/routes/admin.js
+++ b/server/src/routes/admin.js
@@ -110,8 +110,8 @@ router.post('/devices/batch', requireAdmin, wrap(async (req, res) => {
 
 router.get('/devices/:device_id', requireAdmin, wrap(async (req, res) => {
   const result = await deviceDao.findByIdWithHistory(req.params.device_id)
-  if (!result) return res.json(fail(1005, 'DEVICE_NOT_FOUND'))
-  res.json(ok(result))
+  if (!result || !result.device) return res.json(fail(1005, 'DEVICE_NOT_FOUND'))
+  res.json(ok(Object.assign({}, result.device, { binding_history: result.binding_history, recent_treatments: result.recent_treatments })))
 }))
 
 router.post('/devices/:device_id/unbind', requireAdmin, wrap(async (req, res) => {
diff --git a/server/src/routes/device.js b/server/src/routes/device.js
index 789f386..6d7d22c 100644
--- a/server/src/routes/device.js
+++ b/server/src/routes/device.js
@@ -102,8 +102,9 @@ router.post('/device/command/result', requireUser, wrap(async (req, res) => {
   const commandId = parseInt(req.body.command_id || req.body.seq, 10)
   const success = req.body.success !== false
   if (!commandId) return res.json(fail(2001, 'command_id required'))
-  // commandDao.finish verifies device ownership via user binding
-  await commandDao.finish(commandId, success, JSON.stringify(req.body), req.user.user_id)
+  const cmd = await commandDao.findByIdForUser(commandId, req.user.user_id)
+  if (!cmd) return res.json(fail(1006, 'device_not_bound'))
+  await commandDao.finish(commandId, success, JSON.stringify(req.body))
   res.json(ok({ message: 'success' }))
 }))
 
diff --git a/server/src/routes/firmware.js b/server/src/routes/firmware.js
index d2dd070..67be653 100644
--- a/server/src/routes/firmware.js
+++ b/server/src/routes/firmware.js
@@ -17,7 +17,7 @@ router.post('/admin/firmware', requireAdmin, wrap(async (req, res) => {
   const version = String(req.body.version || '').trim()
   const cosKey = String(req.body.cos_key || '').trim()
   if (!version || !cosKey) return res.json(fail(2001, 'version and cos_key required'))
-  const insertId = await firmwareDao.create({
+  const result = await firmwareDao.create({
     version,
     device_type: req.body.device_type || '',
     cos_key: cosKey,
@@ -26,7 +26,7 @@ router.post('/admin/firmware', requireAdmin, wrap(async (req, res) => {
     status: req.body.status === 0 ? 0 : 1
   })
   await logDao.write({ admin_id: req.admin.admin_id, action: 'admin_firmware_create', detail: '登记固件: ' + version, ip: req.ip })
-  res.json(ok({ firmware_id: insertId }))
+  res.json(ok({ firmware_id: result.insertId }))
 }))
 
 router.post('/admin/firmware/:firmware_id/status', requireAdmin, wrap(async (req, res) => {