Merge remote-tracking branch 'origin/master'

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

@@ -114,7 +114,7 @@ public class ExamRoomController extends BaseController {
         return succeed(examRoomService.updateExamRoom(examRoom));
     }
 
-    @ApiOperation("教室状态变更")
+    @ApiOperation("教室状态变更（关闭教室，开启教室）")
     @PostMapping(value = "/openExamRoom")
     public HttpResponseResult<ExamRoom> openExamRoom(Long examRoomId,Integer openFlag){
         ExamRoom examRoom = new ExamRoom();

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

@@ -67,6 +67,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 					sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
 				}
 				employee.setUserId(user.getId());
+				employee.setEmployeeType("EMPLOYEE");
 				employeeDao.insert(employee);
 				//新增用户角色
 				sysUserDao.batchAddEmployeeRole(user.getId(),sysUser.getRoles());
@@ -88,6 +89,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 				sysUserDao.update(sysUser);
 				employee.setUserId(sysUser1.getId());
 				employee.setDelFlag(false);
+				employee.setEmployeeType("EMPLOYEE");
 				employeeDao.update(employee);
 			}else{
 				throw new BizException("用户已存在");
@@ -100,6 +102,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 		sysUserDao.insert(sysUser);
 
 		employee.setUserId(sysUser.getId());
+		employee.setEmployeeType("EMPLOYEE");
 		employeeDao.insert(employee);
 		//新增用户角色
 		sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
@@ -123,6 +126,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 				throw new BizException("手机号已存在");
 			}
 		}
+		employee.setEmployeeType("EMPLOYEE");
 		employeeDao.update(employee);
 
 		Organization organization = organizationDao.findByUserId(employee.getUserId());

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

@@ -116,6 +116,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				Employee employee = employeeDao.get(sysUser.getId());
 				employee.setDelFlag(false);
 				employee.setTenantId(organ.getTenantId());
+				employee.setEmployeeType("ORGAN");
 				employeeDao.update(employee);
 				organ.setDelFlag(YesOrNoEnum.NO);
 				organ.setId(organization.getId());
@@ -147,6 +148,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		employee.setOrganId(organ.getId());
 		employee.setUserId(sysUser.getId());
 		employee.setTenantId(organ.getTenantId());
+		employee.setEmployeeType("ORGAN");
 		employeeDao.insert(employee);
 
 		ImResult imResult = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getRealName(),null));

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

@@ -88,6 +88,7 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 		employee.setOrganId(organ.getId());
 		employee.setUserId(sysUser.getId());
 		employee.setTenantId(tenantInfo.getId().toString());
+		employee.setEmployeeType("ORGAN");
 		employeeDao.insert(employee);
 
 		ImResult imResult = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getRealName(),null));