|
@@ -647,9 +647,11 @@ public class OrgController extends ControllerSupport {
|
|
String fileSuffix = ".json";
|
|
String fileSuffix = ".json";
|
|
|
|
|
|
String filePath = systemConfig.getTempDataDir() + File.separator + "orgProperties"
|
|
String filePath = systemConfig.getTempDataDir() + File.separator + "orgProperties"
|
|
- + File.separator + orgId + fileSuffix;
|
|
|
|
|
|
+ + File.separator + propertyGroupId + "_" + orgId + fileSuffix;
|
|
|
|
+ filePath = PathUtil.getCanonicalPath(filePath);
|
|
File file = new File(filePath);
|
|
File file = new File(filePath);
|
|
String prettyJson = JsonUtil.toPrettyJson(properties);
|
|
String prettyJson = JsonUtil.toPrettyJson(properties);
|
|
|
|
+
|
|
try {
|
|
try {
|
|
FileUtils.write(file, prettyJson, "UTF-8");
|
|
FileUtils.write(file, prettyJson, "UTF-8");
|
|
|
|
|
|
@@ -680,7 +682,6 @@ public class OrgController extends ControllerSupport {
|
|
if (null == orgEntity) {
|
|
if (null == orgEntity) {
|
|
throw new StatusException("001250", "orgId is wrong");
|
|
throw new StatusException("001250", "orgId is wrong");
|
|
}
|
|
}
|
|
- validateRootOrgIsolation(orgEntity.getRootId());
|
|
|
|
|
|
|
|
String key = SystemProps.ORG_PROPERTY_GROUP_PREFIX + propertyGroupId;
|
|
String key = SystemProps.ORG_PROPERTY_GROUP_PREFIX + propertyGroupId;
|
|
|
|
|