bug修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -252,6 +252,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 				if (fireEnduranceRateArray.length > 1) {
 					keySiteDto.setFireEnduranceRate(fireEnduranceRateArray[1]);
 				}
+				keySiteDto.setFireEnduranceRateName(fireEnduranceRateArray[0]);
 			}
 			if (StringUtils.isNotBlank(keySiteExcleDto.getUseNature())
 					&& keySiteExcleDto.getUseNature().contains("@")) {
@@ -259,6 +260,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 				if (useNatureArray.length > 1) {
 					keySiteDto.setUseNature(useNatureArray[1]);
 				}
+				keySiteDto.setUseNatureName(useNatureArray[0]);
 			}
 			if (keySiteExcleDto.getFirePreventionFlagName().equals("有")) {
 				keySiteDto.setFirePreventionFlag(true);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DataSourcesImpl.java

@@ -253,7 +253,7 @@ private void initBuildTreeList(List<Object> menus, List<String> stringList) {
 	 for (Object orgMenuDto : menus) {
 		 JSONObject detailObject= JSONObject.parseObject(orgMenuDto.toString());
 		 if(detailObject.containsKey("id")) {
-			  stringList.add(detailObject.getString("id") + "@" + detailObject.getString("name"));
+			  stringList.add(detailObject.getString("name") + "@" + detailObject.getString("id"));
 		 }
          JSONArray children = detailObject.getJSONArray("children");
          if (children != null && children.size() > 0) {