Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!1860

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionFileUpdate.java

@@ -125,7 +125,7 @@ public class ActionFileUpdate extends BaseAction {
 		
 		if (check) {
 			try {
-				if ( documentQueryService.getFileInfoManagerAssess( effectivePerson, document, categoryInfo, appInfo ) ) {
+				if ( !documentQueryService.getFileInfoManagerAssess( effectivePerson, document, categoryInfo, appInfo ) ) {
 					check = false;
 					Exception exception = new ExceptionDocumentAccessDenied(effectivePerson.getDistinguishedName(), document.getTitle(), document.getId());
 					result.error(exception);

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/edit/ActionSave.java

@@ -55,7 +55,12 @@ public class ActionSave extends BaseAction {
 			return result;
 		}
 
-		File file = new File(Config.base(),Config.dir_config()+"/"+fileName);
+		File configFold = new File(Config.base(),Config.DIR_CONFIG);
+		if(!configFold.exists()){
+			configFold.mkdir();
+		}
+		
+		File file = new File(Config.base(),Config.DIR_CONFIG+"/"+fileName);
 		if(!file.exists()) {
 			file.createNewFile();
 		}