Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java

@@ -186,6 +186,7 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                         thrProductsEntity = new ThrProductsEntity();
                         BeanUtil.copyProperties(item, thrProductsEntity);
                         thrProductsEntity.setCreateTime(new Date());
+                        thrProductsEntity.setSpec(thrProductsEntity.getStandard());
                         thrProductsEntity.setUpdateTime(new Date());
                         thrProductsEntity.setId(IdUtil.getSnowflakeNextId());
                         thrProductsEntity.setThirdSysFk(thrSystemDetailEntity.getThirdSysFk());
@@ -199,7 +200,7 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                         }
                     }
                 });
-                if (list.size() >= limit) {
+                if (list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) {
                     page++;
                 } else {
                     break;
@@ -231,6 +232,7 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                         BeanUtil.copyProperties(item, thrProductsEntity);
                         thrProductsEntity.setCreateTime(new Date());
                         thrProductsEntity.setUpdateTime(new Date());
+                        thrProductsEntity.setSpec(thrProductsEntity.getStandard());
                         thrProductsEntity.setId(IdUtil.getSnowflakeNextId());
                         thrProductsEntity.setThirdSysFk(filterThrProductsRequest.getThirdSys());
                         thrProductsDao.insertThrProducts(thrProductsEntity);