update

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysUserDeviceDao.java

@@ -11,7 +11,7 @@ public interface SysUserDeviceDao extends BaseDAO<Integer, SysUserDevice> {
 
 	List<SysUserDevice> queryByUserId(@Param("clientId") String clientId, @Param("userId") Integer userId);
 
-	List<SysUserDevice> queryByDeviceNum(@Param("clientId") String clientId, @Param("deviceNum") String deviceNum);
+	List<SysUserDevice> queryByDeviceNum(@Param("clientId") String clientId, @Param("deviceNum") String deviceNum, @Param("tenantId") Integer tenantId);
 
 	String getDeviceConfig(@Param("paramName") String paramName, @Param("tenantId") Integer tenantId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysUserDeviceService.java

@@ -9,7 +9,7 @@ public interface SysUserDeviceService extends BaseService<Integer, SysUserDevice
 
 	List<SysUserDevice> queryByUserId(String clientId, Integer userId);
 
-	List<SysUserDevice> queryByDeviceNum(String clientId, String deviceNum);
+	List<SysUserDevice> queryByDeviceNum(String clientId, String deviceNum, Integer tenantId);
 
 	/**
 	 * 绑定设备号

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserDeviceServiceImpl.java

@@ -33,8 +33,8 @@ public class SysUserDeviceServiceImpl extends BaseServiceImpl<Integer, SysUserDe
 	}
 
 	@Override
-	public List<SysUserDevice> queryByDeviceNum(String clientId, String deviceNum) {
-		return sysUserDeviceDao.queryByDeviceNum(clientId, deviceNum);
+	public List<SysUserDevice> queryByDeviceNum(String clientId, String deviceNum, Integer tenantId) {
+		return sysUserDeviceDao.queryByDeviceNum(clientId, deviceNum, tenantId);
 	}
 
 	@Override
@@ -77,7 +77,7 @@ public class SysUserDeviceServiceImpl extends BaseServiceImpl<Integer, SysUserDe
 			}
 		} else {
 			// 查询设备号是否已存在
-			List<SysUserDevice> sysUserDeviceList = sysUserDeviceDao.queryByDeviceNum(null, deviceNum);
+			List<SysUserDevice> sysUserDeviceList = sysUserDeviceDao.queryByDeviceNum(null, deviceNum, tenantId);
 
 			if (sysUserDeviceList == null) {
 				sysUserDeviceList = new ArrayList<SysUserDevice>();