Commit 64eb0249 authored by Tkunkun's avatar Tkunkun

限制分系统下拉树只能选中第三级进行添加

parent 01bf8593
...@@ -477,21 +477,35 @@ public class EquipmentCategoryServiceImpl extends ServiceImpl<EquipmentCategoryM ...@@ -477,21 +477,35 @@ public class EquipmentCategoryServiceImpl extends ServiceImpl<EquipmentCategoryM
Map<String, List<EquipmentCategory>> tmpMap = new HashMap<String, List<EquipmentCategory>>(); Map<String, List<EquipmentCategory>> tmpMap = new HashMap<String, List<EquipmentCategory>>();
equipmentCategories.forEach(action -> { equipmentCategories.forEach(action -> {
if (action.getParentId() == null) { if (action.getParentId() == null) {
action.setLevel("0");
list.add(action); list.add(action);
} else { } else {
if (tmpMap.get(action.getParentId().toString()) == null) { if (tmpMap.get(action.getParentId().toString()) == null) {
ArrayList<EquipmentCategory> tmplist = new ArrayList<EquipmentCategory>(); ArrayList<EquipmentCategory> tmplist = new ArrayList<EquipmentCategory>();
action.setLevel("2");
tmplist.add(action); tmplist.add(action);
tmpMap.put(action.getParentId().toString(), tmplist); tmpMap.put(action.getParentId().toString(), tmplist);
} else { } else {
if (!tmpMap.get(action.getParentId().toString()).contains(action)) { if (!tmpMap.get(action.getParentId().toString()).contains(action)) {
action.setLevel("2");
tmpMap.get(action.getParentId().toString()).add(action); tmpMap.get(action.getParentId().toString()).add(action);
} }
} }
} }
}); });
for(EquipmentCategory type:list){
Long category = type.getId();
List<EquipmentCategory> equipment = tmpMap.get(category.toString());
if(equipment!=null){
for(EquipmentCategory a:equipment){
a.setLevel("1");
}
}
}
getChildrenList(list, tmpMap); getChildrenList(list, tmpMap);
return list; return list;
}
}
} }
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.11.201:3306/dl_business_v3.0.1.3?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai spring.datasource.url = jdbc:mysql://172.16.3.18:3306/business_v3.0.0.2?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=Yeejoin@2020 spring.datasource.password=Yeejoin@2020
spring.datasource.type=com.zaxxer.hikari.HikariDataSource spring.datasource.type=com.zaxxer.hikari.HikariDataSource
...@@ -12,7 +12,7 @@ spring.datasource.hikari.max-lifetime= 1800000 ...@@ -12,7 +12,7 @@ spring.datasource.hikari.max-lifetime= 1800000
spring.datasource.hikari.connection-timeout= 60000 spring.datasource.hikari.connection-timeout= 60000
spring.datasource.hikari.connection-test-query= SELECT 1 spring.datasource.hikari.connection-test-query= SELECT 1
eureka.instance.hostname= 172.16.11.201 eureka.instance.hostname= 172.16.3.18
eureka.instance.prefer-ip-address = true eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/ eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
...@@ -25,9 +25,9 @@ security.appKeyApp=studio_normalapp_3056965 ...@@ -25,9 +25,9 @@ security.appKeyApp=studio_normalapp_3056965
#redis #redis
spring.redis.database=1 spring.redis.database=1
spring.redis.host=172.16.11.201 spring.redis.host=172.16.3.18
spring.redis.port=6379 spring.redis.port=6379
spring.redis.password=1234560 spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200 spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1 spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10 spring.redis.lettuce.pool.max-idle=10
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment