diff --git a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java index 082ae81..a7beb67 100644 --- a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java @@ -131,6 +131,9 @@ public class GeneralServiceImpl implements GeneralService { List list = Arrays.asList(market.split(",")); //判断是否是总部 if (list != null && list.contains("总部")) { + + + List allMarkets = getMarket(); // 获取所有地区 allMarkets.add(0, "总部"); // 将“总部”添加到列表第一位 list = allMarkets; // 更新list diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 25718af..33590e4 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -35,9 +35,9 @@ spring: data: redis: database: 0 - host: 18.143.76.3 - port: 10703 - password: Ngc0FYUTA6h3wC5J + host: localhost + port: 6379 + password: 123456 lettuce: pool: diff --git a/src/main/resources/mapper/PermissionMapper.xml b/src/main/resources/mapper/PermissionMapper.xml index 4e8be29..2b6285e 100644 --- a/src/main/resources/mapper/PermissionMapper.xml +++ b/src/main/resources/mapper/PermissionMapper.xml @@ -92,7 +92,7 @@ ) - order by admin.admin_status desc + order by admin.admin_status desc ,admin.update_time desc