append

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java

@@ -36,9 +36,6 @@ import java.util.Map;
 @Service
 public class PowerAxisTagServiceImpl extends BaseServiceImpl<PowerAxisTagDao, PowerAxisTagEntity> implements PowerAxisTagService {
 
-//    @Autowired
-//    private PowerAxisTagRedis powerAxisTagRedis;
-
     @Autowired
     private LoginUserUtil loginUserUtil;
 
@@ -46,7 +43,7 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl<PowerAxisTagDao, Po
     @Override
     public PageData<PowerAxisTagDTO> page(Map<String, Object> params) {
         IPage<PowerAxisTagEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
+                getPage(params, FieldConstant.CREATED_TIME, true),
                 getWrapper(params)
         );
         return getPageData(page, PowerAxisTagDTO.class);
@@ -63,7 +60,8 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl<PowerAxisTagDao, Po
         String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<PowerAxisTagEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id)
+                .orderByAsc("STRUCT_LEVEL");
 
         return wrapper;
     }