Merge remote-tracking branch 'origin/master'

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/SysUserDao.java

@@ -6,6 +6,7 @@ import com.keao.edu.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 
@@ -42,7 +43,7 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * 删除用户角色
 	 * @param userIds
 	 */
-	void batchDelEmployeeRole(@Param("userIds") List<Integer> userIds);
+	void batchDelEmployeeRole(@Param("userIds") Set<Integer> userIds);
 
 	/**
 	 * 批量新增用户角色
@@ -55,7 +56,7 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @param userIds
 	 * @param roles
 	 */
-	void batchAddEmployeeRoles(@Param("userIds") List<Integer> userIds, @Param("roles") Integer roles);
+	void batchAddEmployeeRoles(@Param("userIds") Set<Integer> userIds, @Param("roles") Integer roles);
 
 	/**
 	 * 获取用户角色

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

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

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

@@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -76,10 +77,10 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 //			if(!user.getTenantId().equals(tenantId)){
 //				throw new BizException("手机号已被占用");
 //			}
-			if(StringUtils.isNotEmpty(user.getUserType()) && user.getUserType().contains("SYSTEM")){
+			if(StringUtils.isNotEmpty(user.getUserType())){
 				throw new BizException("手机号已被占用");
 			}
-			Organization organization = organDao.get(user.getId());
+			Organization organization = organDao.findByUserId(user.getId());
 			if(organization == null){
 				if(StringUtils.isEmpty(user.getPassword())){
 					sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
@@ -187,7 +188,8 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		organDao.update(organization);
 
 		List<Organization> childOrgans = organDao.getChildOrgans(organization1.getParentOrganIdTag());
-		List<Integer> userIds = childOrgans.stream().map(e -> e.getUserId()).collect(Collectors.toList());
+		Set<Integer> userIds = childOrgans.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
+		userIds.add(sysUser.getId());
 
 		sysUserDao.batchDelEmployeeRole(userIds);
 		if(sysUser.getRoles() != null){

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

@@ -10,10 +10,12 @@ import com.keao.edu.im.api.client.ImFeignService;
 import com.keao.edu.im.api.entity.ImResult;
 import com.keao.edu.im.api.entity.ImUserModel;
 import com.keao.edu.user.api.entity.Student;
+import com.keao.edu.user.dao.EmployeeDao;
 import com.keao.edu.user.dao.StudentDao;
 import com.keao.edu.user.dao.StudentExamResultDao;
 import com.keao.edu.user.dao.SysUserDao;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
+import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.page.StudentApplyQueryInfo;
 import com.keao.edu.user.service.StudentService;
 import com.keao.edu.util.collection.MapUtil;
@@ -40,6 +42,8 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     @Autowired
     private SysUserDao sysUserDao;
     @Autowired
+    private EmployeeDao employeeDao;
+    @Autowired
     private StudentExamResultDao studentExamResultDao;
     @Autowired
     private ImFeignService imFeignService;
@@ -58,6 +62,10 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         }
         SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
         if (user != null && user.getId() != null) {
+            Employee employee = employeeDao.get(user.getId());
+            if(employee != null && employee.getDelFlag() == false && employee.getEmployeeType().equals("ORGAN")){
+                throw new BizException("手机号被占用");
+            }
             Student stu = studentDao.get(user.getId());
             if (stu == null) {
                 student.setUserId(user.getId());
@@ -71,9 +79,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             }
             return;
         }
-//        Organization organization = organizationService.get(student.getOrganId());
-//        student.setTenantId(organization.getTenantId());
-//        sysUser.setTenantId(organization.getTenantId());
         sysUser.setUserType("STUDENT");
         sysUserDao.insert(sysUser);
         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/TeacherServiceImpl.java

@@ -10,8 +10,10 @@ import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.im.api.client.ImFeignService;
 import com.keao.edu.im.api.entity.ImResult;
 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.dao.TeacherDao;
+import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.Teacher;
 import com.keao.edu.user.page.TeacherQueryInfo;
 import com.keao.edu.user.service.TeacherService;
@@ -32,6 +34,8 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
 	@Autowired
 	private SysUserDao sysUserDao;
 	@Autowired
+	private EmployeeDao employeeDao;
+	@Autowired
 	private ImFeignService imFeignService;
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
@@ -44,17 +48,14 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int add(Teacher teacher) {
-//		SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
 		SysUser sysUser = teacher.getSysUser();
 		SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
 		Date date = new Date();
-//		String tenantId = queryUserInfo.getTenantId();
-//		teacher.setTenantId(tenantId);
-//		sysUser.setTenantId(tenantId);
 		if(user != null && user.getId() != null){
-//			if(!user.getTenantId().equals(tenantId)){
-//				throw new BizException("手机号已被占用");
-//			}
+			Employee employee = employeeDao.get(user.getId());
+			if(employee != null && employee.getDelFlag() == false && employee.getEmployeeType().equals("ORGAN")){
+				throw new BizException("手机号被占用");
+			}
 			Integer id = user.getId();
 			sysUser.setId(id);
 			Teacher teacher1 = teacherDao.get(id);