...

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

@@ -132,6 +132,8 @@ public class OrgController extends ControllerSupport {
 			d.setRootId(next.getRootId());
 			d.setTelephone(next.getTelephone());
 			d.setDomainName(next.getDomainName());
+			d.setCreationTime(next.getCreationTime());
+			d.setUpdateTime(next.getUpdateTime());
 		}
 
 		PageInfo<OrgDomain> ret = new PageInfo<OrgDomain>();
@@ -191,6 +193,10 @@ public class OrgController extends ControllerSupport {
 			@RequestParam(required = false) String code,
 			@RequestParam(required = false) String name) {
 
+		if (null == parentId) {
+			throw new StatusException("B-001249", "parentId is null");
+		}
+
 		OrgEntity parentOrg = orgRepo.findOne(parentId);
 		if (null == parentOrg) {
 			throw new StatusException("B-001250", "parentId is wrong");
@@ -230,6 +236,8 @@ public class OrgController extends ControllerSupport {
 			d.setRemark(next.getRemark());
 			d.setRootId(next.getRootId());
 			d.setTelephone(next.getTelephone());
+			d.setCreationTime(next.getCreationTime());
+			d.setUpdateTime(next.getUpdateTime());
 		}
 
 		PageInfo<OrgDomain> ret = new PageInfo<OrgDomain>();
@@ -482,11 +490,6 @@ public class OrgController extends ControllerSupport {
 
 		User accessUser = getAccessUser();
 
-		OrgEntity subOrg = orgRepo.findByRootIdAndCode(accessUser.getRootOrgId(), domain.getCode());
-		if (null != subOrg) {
-			throw new StatusException("B-140001", "机构代码已存在");
-		}
-
 		OrgInfo info = new OrgInfo();
 		info.setCode(domain.getCode());
 		info.setName(domain.getName());

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/bean/OrgDomain.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.controller.bean;
 
+import java.util.Date;
 import java.util.Map;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
@@ -37,6 +38,10 @@ public class OrgDomain implements JsonSerializable {
 
 	private Map<String, String> properties;
 
+	private Date updateTime;
+
+	private Date creationTime;
+
 	public Long getId() {
 		return id;
 	}
@@ -125,4 +130,20 @@ public class OrgDomain implements JsonSerializable {
 		this.properties = properties;
 	}
 
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Date getCreationTime() {
+		return creationTime;
+	}
+
+	public void setCreationTime(Date creationTime) {
+		this.creationTime = creationTime;
+	}
+
 }