WANG há 6 anos atrás
pai
commit
46834b3ade

+ 9 - 0
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/OrgService.java

@@ -34,6 +34,15 @@ public interface OrgService {
 	 */
 	OrgEntity saveSubOrg(OrgInfo orgInfo);
 
+	/**
+	 * 保存机构属性
+	 *
+	 * @author WANGWEI
+	 * @param properties
+	 * @param saved
+	 */
+	void saveOrgProperties(Map<String, String> properties, OrgEntity saved);
+
 	/**
 	 * 删除子机构
 	 * 

+ 15 - 17
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/OrgServiceImpl.java

@@ -150,21 +150,7 @@ public class OrgServiceImpl implements OrgService {
 			dataSyncCloudService.syncOrg(req);
 		}
 
-		Map<DynamicEnum, String> map = checkAndGetOrgProperties(properties);
-		for (Entry<DynamicEnum, String> entry : map.entrySet()) {
-			DynamicEnum de = entry.getKey();
-			String value = entry.getValue();
-			OrgPropertyEntity entity = orgPropertyRepo.findByOrgIdAndKeyId(saved.getId(),
-					de.getId());
-			if (null == entity) {
-				entity = new OrgPropertyEntity();
-				entity.setOrgId(saved.getId());
-				entity.setKeyId(de.getId());
-			}
-			entity.setValue(value);
-
-			orgPropertyRepo.save(entity);
-		}
+		saveOrgProperties(properties, saved);
 
 		return saved;
 	}
@@ -258,6 +244,20 @@ public class OrgServiceImpl implements OrgService {
 			dataSyncCloudService.syncOrg(req);
 		}
 
+		saveOrgProperties(properties, saved);
+
+		return saved;
+	}
+
+	/**
+	 * 保存机构属性
+	 *
+	 * @author WANGWEI
+	 * @param properties
+	 * @param saved
+	 */
+	@Override
+	public void saveOrgProperties(Map<String, String> properties, OrgEntity saved) {
 		Map<DynamicEnum, String> map = checkAndGetOrgProperties(properties);
 		for (Entry<DynamicEnum, String> entry : map.entrySet()) {
 			DynamicEnum de = entry.getKey();
@@ -273,8 +273,6 @@ public class OrgServiceImpl implements OrgService {
 
 			orgPropertyRepo.save(entity);
 		}
-
-		return saved;
 	}
 
 	/**