Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/EmployeeController.java

@@ -59,7 +59,7 @@ public class EmployeeController extends BaseController {
 
 	@ApiOperation("更新员工")
 	@PostMapping(value = "/update")
-	public HttpResponseResult update(Employee employee) {
+	public HttpResponseResult update(@RequestBody Employee employee) {
 		employeeService.updateEmployee(employee);
 		return succeed();
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/EmployeeServiceImpl.java

@@ -128,7 +128,6 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 		Organization organization = organizationDao.findByUserId(employee.getUserId());
 		if(organization != null){
 			List<Organization> childOrgans = organizationDao.getChildOrgans(organization.getParentOrganIdTag());
-			childOrgans.add(organization);
 			List<Integer> userIds = childOrgans.stream().map(e -> e.getUserId()).collect(Collectors.toList());
 
 			sysUserDao.batchDelEmployeeRole(userIds);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRoomServiceImpl.java

@@ -237,6 +237,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		if(withoutExamRoomStudentNum>0){
 			throw new BizException("存在未安排教室的学员");
 		}
+
 	}
 
 	@Override

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExaminationBasicServiceImpl.java

@@ -17,6 +17,7 @@ import com.keao.edu.user.service.ExaminationBasicService;
 import com.keao.edu.user.service.OrganizationService;
 import com.keao.edu.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -77,6 +78,10 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
         }
 
         examinationBasic.setTenantId(TenantContextHolder.getTenantId());
+        examinationBasic.setEnrollStartTime(DateUtils.setSeconds(examinationBasic.getEnrollStartTime(), 0));
+        examinationBasic.setEnrollEndTime(DateUtils.setSeconds(examinationBasic.getEnrollEndTime(), 0));
+        examinationBasic.setExpectExamStartTime(DateUtils.setSeconds(examinationBasic.getExpectExamStartTime(), 0));
+        examinationBasic.setExpectExamEndTime(DateUtils.setSeconds(examinationBasic.getExpectExamEndTime(), 0));
 
         List<MusicTheory> musicTheories = musicTheoryDao.getWithTenant(Integer.valueOf(examinationBasic.getTenantId()));
         if (CollectionUtils.isEmpty(musicTheories)) {

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -166,8 +166,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		organization.setUserId(organization1.getUserId());
 		organDao.update(organization);
 
-		List<Organization> childOrgans = organDao.getChildOrgans(organization.getParentOrganIdTag());
-		childOrgans.add(organization);
+		List<Organization> childOrgans = organDao.getChildOrgans(organization1.getParentOrganIdTag());
 		List<Integer> userIds = childOrgans.stream().map(e -> e.getUserId()).collect(Collectors.toList());
 
 		sysUserDao.batchDelEmployeeRole(userIds);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/SubjectServiceImpl.java

@@ -43,7 +43,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
             Subject subject1 = subjectDao.get(subject.getId());
             if(subject1.getParentSubjectId() == 0){
                 //是否有子类
-                List<Subject> byParentId = subjectDao.findByParentId(subject1.getParentSubjectId(), YesOrNoEnum.NO, subject.getTenantId());
+                List<Subject> byParentId = subjectDao.findByParentId(subject.getId(), YesOrNoEnum.NO, subject.getTenantId());
                 if(byParentId != null && byParentId.size() > 0){
                     throw new BizException("操作失败：有未删除的专业");
                 }

edu-user/edu-user-server/src/main/resources/config/mybatis/StudentExamResultMapper.xml

@@ -158,6 +158,7 @@
 	<select id="queryStudentExamResult" resultMap="StudentExamResult" parameterType="map">
 		SELECT
 			ser.*,
+			er.id_ regist_id_,
 			er.card_no_ regist_card_no_,
 			er.student_id_ regist_student_id_,
 			er.organ_id_ regist_organ_id_,