jiangjiazhi / regional-platform

Authored by jiangjiazhi over 8 years ago

1 parent d9e3195985

Exists in master and in 6 other branches

Showing 2 changed files with 11 additions and 1 deletions

...	...	@@ -191,6 +191,7 @@
191	191	List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
192	192	List<BasicConfigResult> configResults = new ArrayList<>();
193	193	if (datas != null) {
	194	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(parentId);
194	195	for (BasicConfig data : datas) {
195	196	BasicConfigResult br = new BasicConfigResult();
196	197	br.setId(data.getId());
...	...	@@ -199,7 +200,7 @@
199	200	br.setName(data.getName());
200	201	br.setParentId(data.getParentId());
201	202	br.setWeight(data.getWeight());
202		-
	203	+ br.setParentName(null==basicConfig?"":basicConfig.getName());
203	204	configResults.add(br);
204	205	}
205	206	}

...	...	@@ -11,11 +11,20 @@
11	11	private int enable;
12	12	private String parentId;
13	13	private String name;
	14	+ private String parentName;
14	15	private String desc;
15	16	//权重
16	17	private Integer weight;
17	18
18	19	private List leastUse;
	20	+
	21	+ public String getParentName() {
	22	+ return parentName;
	23	+ }
	24	+
	25	+ public void setParentName(String parentName) {
	26	+ this.parentName = parentName;
	27	+ }
19	28
20	29	public List getLeastUse() {
21	30	return leastUse;