Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpProductAttributeServiceImpl.java

@@ -11,6 +11,7 @@ import com.usky.common.core.exception.BusinessException;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.domain.DmpProductAttribute;
+import com.usky.iot.domain.DmpProductInfo;
 import com.usky.iot.mapper.DmpProductAttributeMapper;
 import com.usky.iot.service.DmpProductAttributeService;
 import com.usky.iot.service.vo.DmpProductAttributeRequest;
@@ -64,6 +65,7 @@ public class DmpProductAttributeServiceImpl extends AbstractCrudService<DmpProdu
         Integer id = null == dmpProductAttribute.getId() ? -1 : dmpProductAttribute.getId();
         LambdaQueryWrapper<DmpProductAttribute> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(DmpProductAttribute::getAttributeName,dmpProductAttribute.getAttributeName())
+                .eq(DmpProductAttribute::getTenantId,SecurityUtils.getTenantId())
                 .eq(DmpProductAttribute::getDeleteFlag,0);
         DmpProductAttribute one = this.getOne(queryWrapper);
         return null != one && !Objects.equals(one.getId(), id);
@@ -76,6 +78,7 @@ public class DmpProductAttributeServiceImpl extends AbstractCrudService<DmpProdu
         lambdaQuery
                 .eq(StringUtils.isNotBlank(paRequest.getAttributeName()),DmpProductAttribute::getAttributeName,paRequest.getAttributeName())
                 .eq(null != paRequest.getProductId(),DmpProductAttribute::getProductId,paRequest.getProductId())
+                .eq(DmpProductAttribute::getTenantId,SecurityUtils.getTenantId())
                 .eq(DmpProductAttribute::getDeleteFlag,0);
         page = this.page(page,lambdaQuery);
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpProductInfoServiceImpl.java

@@ -124,6 +124,7 @@ public class DmpProductInfoServiceImpl extends AbstractCrudService<DmpProductInf
         Integer id = null == dmpProductInfo.getId() ? -1 : dmpProductInfo.getId();
         LambdaQueryWrapper<DmpProductInfo> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(DmpProductInfo::getProductCode,dmpProductInfo.getProductCode())
+                .eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId())
                 .eq(DmpProductInfo::getDeleteFlag,0);
         DmpProductInfo one = this.getOne(queryWrapper);
         return null != one && !Objects.equals(one.getId(), id);