wangwei před 6 roky
rodič
revize
321147eedc

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

@@ -745,7 +745,7 @@ public class OrgController extends ControllerSupport {
 	@GetMapping("importTemplate")
 	public void getDownloadTemplate(HttpServletResponse response) {
 		String resoucePath = PathUtil.getResoucePath("templates/subOrgImportTemplate.xlsx");
-		exportFile("课程导入模板.xlsx", new File(resoucePath));
+		exportFile("学习中心导入模板.xlsx", new File(resoucePath));
 	}
 
 	@ApiOperation(value = "导入子机构", notes = "")

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

@@ -345,9 +345,28 @@ public class OrgServiceImpl implements OrgService {
 				msg.append("  课程代码不能超过30个字符");
 				hasError = true;
 			}
-
 			org.setCode(code);
 
+			String contacts = trimAndNullIfBlank(line[2]);
+			if (StringUtils.isBlank(contacts)) {
+				msg.append("  联系人不能为空");
+				hasError = true;
+			} else if (contacts.length() > 30) {
+				msg.append("  联系人不能超过30个字符");
+				hasError = true;
+			}
+			org.setContacts(contacts);
+
+			String telephone = trimAndNullIfBlank(line[3]);
+			if (StringUtils.isBlank(telephone)) {
+				msg.append("  联系人不能为空");
+				hasError = true;
+			} else if (telephone.length() > 30) {
+				msg.append("  联系人不能超过30个字符");
+				hasError = true;
+			}
+			org.setTelephone(telephone);
+
 			if (hasError) {
 				failRecords.add(newError(i + 1, msg.toString()));
 			} else {
@@ -363,14 +382,15 @@ public class OrgServiceImpl implements OrgService {
 		for (OrgEntity cur : courseList) {
 			OrgInfo info = new OrgInfo();
 			info.setCode(cur.getCode());
-			info.setParentId(cur.getParentId());
-			info.setRootId(cur.getRootId());
+			info.setParentId(rootOrgId);
+			info.setRootId(rootOrgId);
 
 			info.setName(cur.getName());
 			info.setContacts(cur.getContacts());
 			info.setTelephone(cur.getTelephone());
-			info.setRemark(cur.getRemark());
+
 			OrgEntity saved = saveSubOrg(info);
+
 			createLearnerCenterUser(saved);
 		}