From c305734a7ae0e2d4e74c0bf14e5808762f4ec126 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Fri, 23 Feb 2024 15:40:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=A2=AB=E5=88=AB=E4=BA=BA=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/WxUserInstrumentMapper.xml        | 1 +
 .../miniProgram/service/impl/WxInstrumentServiceImpl.java       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserInstrumentMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserInstrumentMapper.xml
index 1ac9443..93b2a4d 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserInstrumentMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserInstrumentMapper.xml
@@ -84,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select count(1) from wx_user_instrument
         <where>
             <if test="userId != null "> and user_id != #{userId}</if>
+            <if test="serial != null  and serial != ''"> and serial = #{serial}</if>
             <if test="instrumentId != null "> and instrument_id = #{instrumentId}</if>
             <if test="bindingStatus != null "> and binding_status = #{bindingStatus}</if>
             <if test="status != null "> and status = #{status}</if>
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
index 40efd74..337762d 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
@@ -199,7 +199,7 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
             /* 2.2.1、判断序列号是否被别人绑定了 */
             WxUserInstrument query = new WxUserInstrument();
             query.setUserId(wxUserMember.getId());
-            query.setInstrumentId(wxInstrumentSerial.getInstrumentId());
+            query.setSerial(serial);
             query.setStatus(Status.OK.getCode().longValue());
             query.setBindingStatus(BindingStatusEnums.BINDED.getCode());
             Integer num = wxUserInstrumentMapper.selectUiByInstrumentId(query);