From 4662c3662432807804707853932ac1e193b0dc91 Mon Sep 17 00:00:00 2001 From: xjm Date: Sat, 25 Nov 2023 00:27:47 +0800 Subject: [PATCH] =?UTF-8?q?2023.11.21=E4=B8=9A=E4=B8=BB=E6=8F=90=E5=87=BA1?= =?UTF-8?q?.2.3.4=E7=82=B9=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cowr/ssjygl/customer/type/CustomerTypeService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeService.java index abdc585..046ca37 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeService.java @@ -57,7 +57,7 @@ public class CustomerTypeService extends BaseService { // }); out.sort(Comparator.comparing(o -> - Objects.nonNull(o.getInt("customer_type_id"))? CustomerTypeEnum.getSortById(String.valueOf(o.getInt("customer_type_id"))) : Integer.valueOf(-1))); + Objects.nonNull(o.getInt("id"))? CustomerTypeEnum.getSortById(String.valueOf(o.getInt("id"))) : Integer.valueOf(-1))); List root = new ArrayList<>(); root.add(new Record().set("id", -1).set("name", "全部").set("children", out)); @@ -71,7 +71,7 @@ public class CustomerTypeService extends BaseService { if (CollectionUtils.isNotEmpty(customerTypes)) { customerTypes.sort(Comparator.comparing(o -> - Objects.nonNull(o.getInt("customer_type_id"))? CustomerTypeEnum.getSortById(String.valueOf(o.getInt("customer_type_id"))) : Integer.valueOf(-1))); + Objects.nonNull(o.getInt("id"))? CustomerTypeEnum.getSortById(String.valueOf(o.getInt("id"))) : Integer.valueOf(-1))); }