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

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/web/controller/RoleController.java

@@ -58,7 +58,7 @@ public class RoleController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('role/update')")
 	public Object updateRole(@RequestBody SysRole sysRole) {
 		sysRole.setUpdateTime(new Date());
-		sysRole.setTenantId(TenantContextHolder.getTenantId().toString());
+		sysRole.setTenantId(TenantContextHolder.getTenantId());
 		sysRoleService.updateRole(sysRole);
 		return succeed();
 	}
@@ -67,7 +67,7 @@ public class RoleController extends BaseController {
 	@PostMapping(value = "/add")
     @PreAuthorize("@pcs.hasPermissions('role/add')")
 	public Object addRole(@RequestBody SysRole sysRole) {
-		sysRole.setTenantId(TenantContextHolder.getTenantId().toString());
+		sysRole.setTenantId(TenantContextHolder.getTenantId());
 		sysRoleService.addRole(sysRole);
 		return succeed();
 	}

edu-common/src/main/java/com/keao/edu/common/tenant/TenantContextHolder.java

@@ -4,7 +4,7 @@ package com.keao.edu.common.tenant;
 public class TenantContextHolder {
 	
 
-	private static final ThreadLocal<Object> tenantContextHolder = new ThreadLocal<Object>();
+	private static final ThreadLocal<String> tenantContextHolder = new ThreadLocal<String>();
 
 	public static void setTenantId(String tenantId) {
 		tenantContextHolder.set(tenantId);
@@ -14,7 +14,7 @@ public class TenantContextHolder {
 	 * 获取数据源
 	 * @return
 	 */
-	public static Object getTenantId() {
+	public static String getTenantId() {
 		return tenantContextHolder.get();
 	}
 

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

@@ -47,7 +47,7 @@ public class ExamLocationController extends BaseController {
     @ApiOperation("新增考点")
     @PostMapping(value = "/add")
     public HttpResponseResult add(@RequestBody ExamLocation examLocation) {
-        examLocation.setTenantId(TenantContextHolder.getTenantId().toString());
+        examLocation.setTenantId(TenantContextHolder.getTenantId());
         examLocationService.insert(examLocation);
         return succeed();
     }

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

@@ -36,7 +36,7 @@ public class ExamManualLedgerController extends BaseController {
     @PostMapping(value = "/add")
     public HttpResponseResult add(@RequestBody ExamManualLedger examManualLedger) {
         examManualLedger.setTransDirection(TransDirectionEnum.EXPENDITURE);
-        examManualLedger.setTenantId(TenantContextHolder.getTenantId().toString());
+        examManualLedger.setTenantId(TenantContextHolder.getTenantId());
         examManualLedgerService.addExamManualLedger(examManualLedger);
         return succeed();
     }

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

@@ -36,7 +36,7 @@ public class ExamMusicTheoryController extends BaseController {
     @ApiOperation("新增")
     @PostMapping(value = "/add")
     public HttpResponseResult add(ExamMusicTheory examMusicTheory) {
-        examMusicTheory.setTenantId(TenantContextHolder.getTenantId().toString());
+        examMusicTheory.setTenantId(TenantContextHolder.getTenantId());
         examMusicTheoryService.insert(examMusicTheory);
         return succeed();
     }

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

@@ -51,7 +51,9 @@ public class ExamRegistrationController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (!sysUser.getIsSuperAdmin() && Objects.isNull(queryInfo.getOrganId())) {
             Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.isNull(employee))
+            if(Objects.isNull(employee)){
+                return failed("用户信息异常");
+            }
             queryInfo.setOrganId(employee.getOrganId());
         }
         return succeed(examRegistrationService.queryExamRegistrationStudents(queryInfo));

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

@@ -36,12 +36,12 @@ public class ExamRoomController extends BaseController {
     @GetMapping(value = "/list")
     public HttpResponseResult<PageInfo<ExamRoomDto>> getList(ExamRoomQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-
         if(!sysUser.getIsSuperAdmin()&&Objects.isNull(queryInfo.getOrganId())){
             Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.nonNull(employee)){
-                queryInfo.setOrganId(employee.getOrganId());
+            if(Objects.isNull(employee)){
+                return failed("用户信息异常");
             }
+            queryInfo.setOrganId(employee.getOrganId());
         }
         return succeed(examRoomService.queryExamRoomPage(queryInfo));
     }
@@ -50,7 +50,11 @@ public class ExamRoomController extends BaseController {
     @PostMapping(value = "/update")
     public HttpResponseResult update(@RequestBody ExamRoom examRoom){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        examRoom.setOrganId(sysUser.getId());
+        Employee employee = employeeService.get(sysUser.getId());
+        if(Objects.isNull(employee)){
+            return failed("用户信息异常");
+        }
+        examRoom.setOrganId(employee.getOrganId());
         examRoomService.update(examRoom);
         return succeed();
     }
@@ -59,7 +63,11 @@ public class ExamRoomController extends BaseController {
     @PostMapping(value = "/createExamRoom")
     public HttpResponseResult createExamRoom(@RequestBody ExamRoom examRoom){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        examRoom.setOrganId(sysUser.getId());
+        Employee employee = employeeService.get(sysUser.getId());
+        if(Objects.isNull(employee)){
+            return failed("用户信息异常");
+        }
+        examRoom.setOrganId(employee.getOrganId());
         examRoomService.createExamRoom(examRoom);
         return succeed();
     }
@@ -68,7 +76,11 @@ public class ExamRoomController extends BaseController {
     @PostMapping(value = "/updateExamRoom")
     public HttpResponseResult<ExamRoom> updateExamRoom(@RequestBody ExamRoom examRoom){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        examRoom.setOrganId(sysUser.getId());
+        Employee employee = employeeService.get(sysUser.getId());
+        if(Objects.isNull(employee)){
+            return failed("用户信息异常");
+        }
+        examRoom.setOrganId(employee.getOrganId());
         return succeed(examRoomService.updateExamRoom(examRoom));
     }
 

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

@@ -51,7 +51,7 @@ public class ExamSongController extends BaseController {
     @ApiOperation("新增曲库")
     @PostMapping(value = "/add")
     public HttpResponseResult add(@RequestBody ExamSong examSong) {
-        examSong.setTenantId(TenantContextHolder.getTenantId().toString());
+        examSong.setTenantId(TenantContextHolder.getTenantId());
         examSongService.insert(examSong);
         return succeed();
     }

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

@@ -34,6 +34,6 @@ public class ExamSubjectController extends BaseController {
     @ApiOperation("获取与考级项目无关的专业")
     @GetMapping(value = "/getUnRelatedWithExamSubjects")
     public HttpResponseResult<List<Subject>> getUnRelatedWithExamSubjects(Integer examId){
-        return succeed(examSubjectService.getUnRelatedWithExamSubjects(Integer.valueOf(TenantContextHolder.getTenantId().toString()), examId));
+        return succeed(examSubjectService.getUnRelatedWithExamSubjects(Integer.valueOf(TenantContextHolder.getTenantId()), examId));
     }
 }

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

@@ -42,7 +42,7 @@ public class MusicTheoryController extends BaseController {
     @ApiOperation("新增乐理")
     @PostMapping(value = "/add")
     public HttpResponseResult add(MusicTheory musicTheory) {
-        musicTheory.setTenantId(TenantContextHolder.getTenantId().toString());
+        musicTheory.setTenantId(TenantContextHolder.getTenantId());
         musicTheoryService.addMusicTheory(musicTheory);
         return succeed();
     }

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

@@ -5,10 +5,8 @@ import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.user.dao.EmployeeDao;
 import com.keao.edu.user.dto.StudentExamResultStatisticsDto;
 import com.keao.edu.user.entity.Employee;
-import com.keao.edu.user.entity.ExamReview;
 import com.keao.edu.user.entity.StudentExamResult;
 import com.keao.edu.user.page.StudentExamResultQueryInfo;
 import com.keao.edu.user.service.EmployeeService;
@@ -45,9 +43,10 @@ public class StudentExamResultController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(!sysUser.getIsSuperAdmin()&&Objects.isNull(queryInfo.getOrganId())){
             Employee employee = employeeService.get(sysUser.getId());
-            if(Objects.nonNull(employee)){
-                queryInfo.setOrganId(employee.getOrganId());
+            if(Objects.isNull(employee)){
+                return failed("用户信息异常");
             }
+            queryInfo.setOrganId(employee.getOrganId());
         }
         return succeed(studentExamResultService.queryStudentExamResult(queryInfo));
     }

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

@@ -29,7 +29,7 @@ public class SubjectController extends BaseController {
     @PostMapping("/upset")
     @PreAuthorize("@pcs.hasPermissions('subject/upset')")
     public HttpResponseResult update(@RequestBody Subject subject){
-        subject.setTenantId(TenantContextHolder.getTenantId().toString());
+        subject.setTenantId(TenantContextHolder.getTenantId());
         subjectService.upSetSubject(subject);
         return succeed();
     }
@@ -59,6 +59,6 @@ public class SubjectController extends BaseController {
     @GetMapping("/findSubSubjects")
     @PreAuthorize("@pcs.hasPermissions('subject/findSubSubjects')")
     public HttpResponseResult<List<Subject>> findSubSubjects(){
-        return succeed(subjectService.findSubSubjects(Integer.parseInt(TenantContextHolder.getTenantId().toString())));
+        return succeed(subjectService.findSubSubjects(Integer.parseInt(TenantContextHolder.getTenantId())));
     }
 }

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

@@ -36,7 +36,7 @@ public class SysConfigController extends BaseController {
 	@GetMapping(value = "list")
     @PreAuthorize("@pcs.hasPermissions('sysConfig/list')")
 	public Object configList(String group) {
-		String tenantId = TenantContextHolder.getTenantId().toString();
+		String tenantId = TenantContextHolder.getTenantId();
 		Map<String,Object> params = new HashMap<String, Object>();
 		params.put("group", group);
 		params.put("tenantId", tenantId);

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

@@ -38,7 +38,7 @@ public class TenantInfoController extends BaseController {
 	@ApiOperation("查询机构详情")
 	@GetMapping(value = "/query")
 	public HttpResponseResult<TenantInfo> query() {
-		String tenantId = TenantContextHolder.getTenantId().toString();
+		String tenantId = TenantContextHolder.getTenantId();
 		return succeed(tenantInfoService.get(Integer.parseInt(tenantId)));
 	}
 
@@ -54,7 +54,7 @@ public class TenantInfoController extends BaseController {
 	public HttpResponseResult update(@RequestBody TenantInfoDto tenantInfo) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if(!sysUser.getIsSuperAdmin()){
-			String tenantId = TenantContextHolder.getTenantId().toString();
+			String tenantId = TenantContextHolder.getTenantId();
 			tenantInfo.setId(Integer.parseInt(tenantId));
 		}
 		tenantInfo.setUpdateTime(new Date());

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/StudentExamResultQueryInfo.java

@@ -1,6 +1,7 @@
 package com.keao.edu.user.page;
 
 import com.keao.edu.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * @Author Joburgess
@@ -8,14 +9,19 @@ import com.keao.edu.common.page.QueryInfo;
  */
 public class StudentExamResultQueryInfo extends QueryInfo {
 
+    @ApiModelProperty(value = "合作单位编号")
     private Integer organId;
 
+    @ApiModelProperty(value = "考级项目编号")
     private Integer examId;
 
+    @ApiModelProperty(value = "准考证号")
     private String cardNo;
 
+    @ApiModelProperty(value = "专业编号")
     private Integer subjectId;
 
+    @ApiModelProperty(value = "级别")
     private Integer level;
 
     public Integer getOrganId() {

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

@@ -132,7 +132,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 				throw new BizException("合作单位冲突");
 			}
 			ExamOrganizationRelation og = new ExamOrganizationRelation();
-			og.setTenantId(TenantContextHolder.getTenantId().toString());
+			og.setTenantId(TenantContextHolder.getTenantId());
 			og.setExaminationBasicId(examId);
 			og.setOrganId(organId);
 			Organization organization = idOrganMap.get(organId);

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

@@ -100,12 +100,31 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		if(StringUtils.isBlank(examRoom.getExamTimeJson())){
 			throw new BizException("请指定考试时间");
 		}
-		examRoom.setTenantId(TenantContextHolder.getTenantId().toString());
+		examRoom.setTenantId(TenantContextHolder.getTenantId());
 		examRoom.setExamPlanPushFlag(YesOrNoEnum.NO);
 		if(StringUtils.isBlank(examRoom.getExamTimeJson())){
 			examRoomDao.insert(examRoom);
 			return;
 		}
+
+		List<Integer> teacherIds=new ArrayList<>();
+		teacherIds.add(examRoom.getMainTeacherUserId());
+		if(StringUtils.isNotBlank(examRoom.getAssistantTeacherUserIdList())){
+			teacherIds.addAll(Arrays.stream(examRoom.getAssistantTeacherUserIdList().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toList()));
+		}
+
+		Map<Integer, String> teacherIdNameMap = this.getMap("sys_user", "id_", "real_name_", teacherIds, Integer.class, String.class);
+
+		examRoom.setMainTeacherName(teacherIdNameMap.get(examRoom.getMainTeacherUserId()));
+		if(StringUtils.isNotBlank(examRoom.getAssistantTeacherUserIdList())){
+			List<Integer> assistantTeacherIds = Arrays.stream(examRoom.getAssistantTeacherUserIdList().split(",")).map(id -> Integer.valueOf(id)).collect(Collectors.toList());
+			List<String> assistantTeacherNames = new ArrayList<>();
+			for (Integer assistantTeacherId : assistantTeacherIds) {
+				assistantTeacherNames.add(teacherIdNameMap.get(assistantTeacherId));
+			}
+			examRoom.setAssistantTeacherUserNameList(StringUtils.join(assistantTeacherNames, ","));
+		}
+
 		List<ExamRoom> examRooms=new ArrayList<>();
 		List<JSONObject> examTimes = JSON.parseArray(examRoom.getExamTimeJson(), JSONObject.class);
 		for (JSONObject examTime : examTimes) {
@@ -126,6 +145,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 			examRooms.add(er);
 		}
 		checkRoomTeachers(examRooms);
+
 		Date minStartTime = examRooms.stream().min(Comparator.comparing(ExamRoom::getExamStartTime)).get().getExamStartTime();
 		Date maxEndTime = examRooms.stream().max(Comparator.comparing(ExamRoom::getExamEndTime)).get().getExamEndTime();
 
@@ -150,6 +170,24 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		if(Objects.isNull(examRoom.getId())){
 			throw new BizException("请指定教室");
 		}
+
+		List<Integer> teacherIds=new ArrayList<>();
+		teacherIds.add(examRoom.getMainTeacherUserId());
+		if(StringUtils.isNotBlank(examRoom.getAssistantTeacherUserIdList())){
+			teacherIds.addAll(Arrays.stream(examRoom.getAssistantTeacherUserIdList().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toList()));
+		}
+
+		Map<Integer, String> teacherIdNameMap = this.getMap("sys_user", "id_", "real_name_", teacherIds, Integer.class, String.class);
+
+		examRoom.setMainTeacherName(teacherIdNameMap.get(examRoom.getMainTeacherUserId()));
+		if(StringUtils.isNotBlank(examRoom.getAssistantTeacherUserIdList())){
+			List<Integer> assistantTeacherIds = Arrays.stream(examRoom.getAssistantTeacherUserIdList().split(",")).map(id -> Integer.valueOf(id)).collect(Collectors.toList());
+			List<String> assistantTeacherNames = new ArrayList<>();
+			for (Integer assistantTeacherId : assistantTeacherIds) {
+				assistantTeacherNames.add(teacherIdNameMap.get(assistantTeacherId));
+			}
+			examRoom.setAssistantTeacherUserNameList(StringUtils.join(assistantTeacherNames, ","));
+		}
 		examRoomDao.update(examRoom);
 		return examRoom;
 	}

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

@@ -98,7 +98,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 			e.setExaminationBasicId(examRoom.getExaminationBasicId());
 			e.setExamRoomId(examRoom.getId());
 			e.setStudentId(Integer.valueOf(studentId));
-			e.setTenantId(TenantContextHolder.getTenantId().toString());
+			e.setTenantId(TenantContextHolder.getTenantId());
 			examRoomStudentRelations.add(e);
 
 			StudentExamResult ser = new StudentExamResult();
@@ -106,7 +106,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 			ser.setStudentId(Integer.valueOf(studentId));
 			ser.setIsFinishedExam(0);
 			ser.setConfirmStatus(0);
-			ser.setTenantId(TenantContextHolder.getTenantId().toString());
+			ser.setTenantId(TenantContextHolder.getTenantId());
 			studentExamResults.add(ser);
 
 			ExamCertification ec=new ExamCertification();
@@ -118,7 +118,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 			ec.setExamStartTime(examRoom.getExamStartTime());
 			ec.setExamEndTime(examRoom.getExamEndTime());
 			ec.setExamAddress(examLocation.getAddress());
-			ec.setTenantId(TenantContextHolder.getTenantId().toString());
+			ec.setTenantId(TenantContextHolder.getTenantId());
 			examCertifications.add(ec);
 		}
 		if(!CollectionUtils.isEmpty(examRoomStudentRelations)){

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

@@ -53,6 +53,9 @@ public class ExamSubjectSongServiceImpl extends BaseServiceImpl<Long, ExamSubjec
 		if(CollectionUtils.isEmpty(examSubjectSongs)){
 			return;
 		}
+		if(Objects.isNull(examSubjectSongs.get(0).getExaminationBasicId())){
+			throw new BizException("请指定考级项目");
+		}
 		ExaminationBasic examinationBasic = examinationBasicDao.get(examSubjectSongs.get(0).getExaminationBasicId().longValue());
 		if(Objects.isNull(examinationBasic)){
 			throw new BizException("考级项目不存在");
@@ -88,7 +91,7 @@ public class ExamSubjectSongServiceImpl extends BaseServiceImpl<Long, ExamSubjec
 				throw new BizException("请指定报名费用");
 			}
 
-			examSubjectSong.setTenantId(TenantContextHolder.getTenantId().toString());
+			examSubjectSong.setTenantId(TenantContextHolder.getTenantId());
 
 			if(existSubjectIds.contains(examSubjectSong.getExamSubjectId().longValue())){
 				continue;
@@ -98,7 +101,7 @@ public class ExamSubjectSongServiceImpl extends BaseServiceImpl<Long, ExamSubjec
 			newExamSubject.setExaminationBasicId(examSubjectSong.getExaminationBasicId());
 			newExamSubject.setTenantId(examSubjectSong.getTenantId());
 			newExamSubject.setSubjectId(examSubjectSong.getExamSubjectId().intValue());
-			newExamSubject.setTenantId(TenantContextHolder.getTenantId().toString());
+			newExamSubject.setTenantId(TenantContextHolder.getTenantId());
 			newExamSubjects.add(newExamSubject);
 			existSubjectIds.add(newExamSubject.getSubjectId().longValue());
 		}

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

@@ -152,7 +152,7 @@ public class ExamTeacherSalaryServiceImpl extends BaseServiceImpl<Long, ExamTeac
 			ets.setTotalSettlementCost(BigDecimal.ZERO);
 			ets.setTotalInvigilationStudentNum(0);
 			ets.setTotalInvigilationNum(0);
-			ets.setTenantId(TenantContextHolder.getTenantId().toString());
+			ets.setTenantId(TenantContextHolder.getTenantId());
 			examTeacherSalaries.add(ets);
 		}
 		examTeacherSalaryDao.batchInsert(examTeacherSalaries);

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

@@ -72,7 +72,7 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
             examinationBasic.setExamLocationNameList(StringUtils.join(organNameMap.keySet(),","));
         }
 
-        examinationBasic.setTenantId(TenantContextHolder.getTenantId().toString());
+        examinationBasic.setTenantId(TenantContextHolder.getTenantId());
 
         List<MusicTheory> musicTheories = musicTheoryDao.getWithTenant(Integer.valueOf(examinationBasic.getTenantId()));
         if (CollectionUtils.isEmpty(musicTheories)) {

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

@@ -17,7 +17,7 @@
 		<result column="operator_user_id_" property="operatorUserId" />
 		<result column="tenant_id_" property="tenantId" />
 		<result column="create_time_" property="createTime" />
-		<association property="organization" columnPrefix="organ_" resultMap="com.keao.edu.user.dao.OrganizationDao"/>
+		<association property="organization" columnPrefix="organ_" resultMap="com.keao.edu.user.dao.OrganizationDao.Organization"/>
 		<association property="operator" columnPrefix="user_" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
 	</resultMap>
 	

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

@@ -282,7 +282,7 @@
 
     <select id="queryUnRelatedOrgans" resultMap="com.keao.edu.user.dao.OrganizationDao.Organization">
 		SELECT
-			*
+			<include refid="com.keao.edu.user.dao.OrganizationDao.organizationColumn"/>
 		FROM
 			organization o
 		<include refid="queryUnRelatedOrgansCondition"/>