Merge remote-tracking branch 'origin/master'

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

@@ -12,7 +12,6 @@ import com.keao.edu.im.api.entity.ImUserModel;
 import com.keao.edu.user.dao.EmployeeDao;
 import com.keao.edu.user.dao.SysUserDao;
 import com.keao.edu.user.entity.Employee;
-import com.keao.edu.user.enums.YesOrNoEnum;
 import com.keao.edu.user.service.EmployeeService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,19 +61,18 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 			}
 			return;
 		}
-		user = new SysUser();
-		user.setTenantId(tenantId);
-		user.setPassword(new BCryptPasswordEncoder().encode("123456"));
-		user.setUserType("SYSTEM");
-		sysUserDao.insert(user);
+		sysUser.setTenantId(tenantId);
+		sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
+		sysUser.setUserType("SYSTEM");
+		sysUserDao.insert(sysUser);
 
-		employee.setUserId(user.getId());
+		employee.setUserId(sysUser.getId());
 		employeeDao.insert(employee);
 		//新增用户角色
-		sysUserDao.batchAddEmployeeRole(user.getId(),sysUser.getRoles());
-		ImResult imResult = imFeignService.register(new ImUserModel(user.getId().toString(), user.getRealName(),null));
-		user.setImToken(imResult.getToken());
-		sysUserDao.update(user);
+		sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
+		ImResult imResult = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getRealName(),null));
+		sysUser.setImToken(imResult.getToken());
+		sysUserDao.update(sysUser);
 	}
 
 	@Override

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

@@ -54,7 +54,7 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
 		if(Objects.isNull(examinationBasic.getExamMode())){
 			throw new BizException("请选择考试类型");
 		}
-		if(ExamModeEnum.OFFLINE.equals(examinationBasic.getExamMode())&&Objects.nonNull(examinationBasic.getExamLocationIdList())){
+		if(ExamModeEnum.OFFLINE.equals(examinationBasic.getExamMode())&&StringUtils.isBlank(examinationBasic.getExamLocationIdList())){
 			throw new BizException("请指定考试地点");
 		}
 		if(Objects.isNull(examinationBasic.getEnrollStartTime())||Objects.isNull(examinationBasic.getEnrollEndTime())){

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

@@ -101,7 +101,7 @@
 	</update>
 	<sql id="employeeQueryPage">
 		<where>
-				e.del_flag_ = 1 AND e.tenant_id_ = #{tenantId}
+				e.del_flag_ = 0 AND e.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND (e.user_id_ = #{search} OR su.phone_ LIKE CONCAT('%',#{search},'%') OR su.real_name_ LIKE CONCAT('%',#{search},'%'))
 			</if>