WANG vor 6 Jahren
Ursprung
Commit
7cdeec230a

+ 3 - 1
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/SysConfigCloudServiceProvider.java

@@ -61,7 +61,9 @@ public class SysConfigCloudServiceProvider extends ControllerSupport
 		Object value = sysConfigService.get(key);
 
 		String strValue = null;
-		if (value instanceof Date) {
+		if (null == value) {
+			strValue = null;
+		} else if (value instanceof Date) {
 			strValue = DateUtil.format((Date) value, DatePatterns.ISO);
 		} else {
 			strValue = String.valueOf(value);

+ 1 - 1
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/AuthServiceImpl.java

@@ -165,7 +165,7 @@ public class AuthServiceImpl implements AuthService {
 			}
 		}
 
-		String accessibleRootOrgIds = PropertiesUtil.getString("$auth.accessibleRootOrgIds");
+		String accessibleRootOrgIds = (String) sysConfigService.get("ACCESSIBLE_ROOT_ORG_LIST");
 		if (StringUtils.isNotBlank(accessibleRootOrgIds)) {
 			accessibleRootOrgIds = "," + accessibleRootOrgIds + ",";
 			if (!accessibleRootOrgIds.contains("," + rootOrg.getId() + ",")) {

+ 6 - 2
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/SysConfigServiceImpl.java

@@ -37,7 +37,9 @@ public class SysConfigServiceImpl implements SysConfigService {
 		}
 		DataType dataType = sysConf.getDataType();
 
-		if (dataType.equals(DataType.STRING)) {
+		if (StringUtils.isBlank(value)) {
+			sysConf.setValue(null);
+		} else if (dataType.equals(DataType.STRING)) {
 			sysConf.setValue(value);
 		} else if (dataType.equals(DataType.LONG)) {
 			try {
@@ -84,7 +86,9 @@ public class SysConfigServiceImpl implements SysConfigService {
 		String value = sysConf.getValue();
 		DataType dataType = sysConf.getDataType();
 
-		if (dataType.equals(DataType.STRING)) {
+		if (StringUtils.isBlank(value)) {
+			return null;
+		} else if (dataType.equals(DataType.STRING)) {
 			return value;
 		} else if (dataType.equals(DataType.LONG)) {
 			try {