fix

rankin-user-service/src/main/java/cn/rankin/userservice/repository/TerminalDeviceRepository.java

@@ -19,12 +19,10 @@ public interface TerminalDeviceRepository extends BasicJpaRepository<TerminalDev
     TerminalDevice findByDeviceCodeOrUserId(String code, String userId);
 
     @Modifying
+    @Query(value = "delete from TerminalDevice td where td.userId = ?1")
     Integer deleteByUserId(String userId);
 
     @Modifying
     Integer deleteByDeviceCodeAndMerchant(String code, String merchant);
 
-    @Modifying
-    @Query(value = "delete from TerminalDevice td where td.userId = ?1 And td.merchant = ?2")
-    Integer deleteByUserIdAndMerchant(String userId, String merchant);
 }

rankin-user-service/src/main/java/cn/rankin/userservice/service/TerminalDeviceService.java

@@ -40,7 +40,7 @@ public class TerminalDeviceService {
                 //根据设备号，merchant,删除设备绑定记录,后面会重新添加绑定关系
                 //deleteTerminalDeviceByDeviceCodeMerchant(deviceCode, merchant);
                 //根据设备号，merchant,删除设备绑定记录,后面会重新添加绑定关系
-                deleteTerminalDeviceByUidMerchant(userId, merchant);
+                deleteTerminalDeviceByUid(userId);
                 terminalDeviceBindLogService.insert(deviceCode, merchant, userId, brand, ip, modelNo, terminal+"_del");
             }
         }
@@ -60,9 +60,8 @@ public class TerminalDeviceService {
         return APIResult.ok(deviceBind);
     }
 
-    private void deleteTerminalDeviceByUidMerchant(String userId, String merchant) {
-        terminalDeviceRepository.deleteByUserIdAndMerchant(userId, merchant);
-        terminalDeviceRepository.deleteByUserIdAndMerchant(userId, null);
+    private void deleteTerminalDeviceByUid(String userId) {
+        terminalDeviceRepository.deleteByUserId(userId);
     }
 
     private void deleteTerminalDeviceByDeviceCodeMerchant(String deviceCode, String merchant) {