lipenghui 3 月之前
父節點
當前提交
27e11a208f

+ 1 - 1
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/IotDeviceDO.java

@@ -140,7 +140,7 @@ public class IotDeviceDO extends BaseDO {
 
     private Long assetClass;
 
-    private Integer sortColumn;
+    private Long sortColumn;
 
     /**
      * 设备分类BOM同步状态 1已同步 2未同步

+ 2 - 2
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/IotDeviceMapper.java

@@ -55,8 +55,8 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> {
                 .eqIfPresent(IotDeviceDO::getInfoRemark, reqVO.getInfoRemark())
                 .eqIfPresent(IotDeviceDO::getInfoUrl, reqVO.getInfoUrl())
                 .eqIfPresent(IotDeviceDO::getTemplateJson, reqVO.getTemplateJson())
-                .eqIfPresent(IotDeviceDO::getBomSyncStatus, reqVO.getBomSyncStatus())
-                .orderByAsc(IotDeviceDO::getSortColumn));
+                .eqIfPresent(IotDeviceDO::getBomSyncStatus, reqVO.getBomSyncStatus()));
+//                .orderByAsc(IotDeviceDO::getSortColumn));
     }
 
     default List<IotDeviceDO> selectSimpleList(Collection<Long> deptIds) {