2023.11.21业主提出1.2.3.4点相关修改

dev
徐杰盟 2023-11-25 00:27:47 +08:00
parent d93f6aced8
commit 4662c36624
1 changed files with 2 additions and 2 deletions

View File

@ -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<Record> 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)));
}