|
@@ -28,7 +28,7 @@ public class KlConceptScaleFacade extends KlConceptScaleServiceImpl {
|
|
|
List<KlConceptScale> list = this.list(new QueryWrapper<KlConceptScale>()
|
|
|
.in("concept_id", klScaleDetailMenuVO.getConceptId())
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
- .orderByAsc("group_num", "order_no"));
|
|
|
+ .orderByAsc("text_type","group_num", "order_no"));
|
|
|
List<KlScaleDetailWrapper> menuList = new ArrayList<>();
|
|
|
menuList = BeanUtil.listCopyTo(list, KlScaleDetailWrapper.class);
|
|
|
Map<Long, List<KlScaleDetailWrapper>> menuMap = EntityUtil.makeEntityListMap(menuList, "parentId");
|