Merge remote-tracking branch 'origin/master'

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/Student.java

@@ -19,7 +19,7 @@ public class Student extends SysUser{
 
 	private java.util.Date updateTime;
 
-	private String tenantId;
+//	private String tenantId;
 
 	private Integer organId;
 
@@ -96,13 +96,13 @@ public class Student extends SysUser{
 		return this.updateTime;
 	}
 			
-	public void setTenantId(String tenantId){
+	/*public void setTenantId(String tenantId){
 		this.tenantId = tenantId;
 	}
-	
+
 	public String getTenantId(){
 		return this.tenantId;
-	}
+	}*/
 			
 	@Override
 	public String toString() {

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/TenantInfo.java

@@ -1,5 +1,6 @@
 package com.keao.edu.user.entity;
 
+import com.keao.edu.auth.api.entity.SysUser;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -33,7 +34,18 @@ public class TenantInfo {
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	@ApiModelProperty(value = "用户信息",required = false)
+	private SysUser sysUser;
+
+	public SysUser getSysUser() {
+		return sysUser;
+	}
+
+	public void setSysUser(SysUser sysUser) {
+		this.sysUser = sysUser;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

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

@@ -1,11 +1,11 @@
 package com.keao.edu.user.service.impl;
 
 
+import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.exception.BizException;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
-import com.keao.edu.common.tenant.TenantContextHolder;
 import com.keao.edu.im.api.client.ImFeignService;
 import com.keao.edu.im.api.entity.ImResult;
 import com.keao.edu.im.api.entity.ImUserModel;
@@ -28,6 +28,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 	private ImFeignService imFeignService;
 	@Autowired
 	private SysUserDao sysUserDao;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
 	@Override
 	public BaseDAO<Integer, Employee> getDAO() {
@@ -37,11 +39,16 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void add(Employee employee) {
-		String tenantId = TenantContextHolder.getTenantId().toString();
+		SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
+		String tenantId = queryUserInfo.getTenantId();
+
 		SysUser sysUser = employee.getSysUser();
 		employee.setTenantId(tenantId);
 		SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
 		if(user != null && user.getId() != null){
+			if(!user.getTenantId().equals(tenantId)){
+				throw new BizException("手机号已被占用");
+			}
 			Employee employee1 = employeeDao.get(user.getId());
 			if(employee1 == null){
 				if(StringUtils.isEmpty(user.getPassword())){
@@ -51,7 +58,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 				employeeDao.insert(employee);
 				//新增用户角色
 				sysUserDao.batchAddEmployeeRole(user.getId(),sysUser.getRoles());
-				user.setUserType(user.getUserType() + ",SYSTEM");
+				if(!user.getUserType().contains("SYSTEM")){
+					user.setUserType(user.getUserType() + ",SYSTEM");
+				}
 				sysUserDao.update(user);
 			}else if(employee1.getDelFlag()){
 				employee1.setDelFlag(false);

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

@@ -65,6 +65,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		organ.setLevel(currentOrganization.getLevel() + 1);
 
 		if(user != null && user.getId() != null){
+			if(!user.getTenantId().equals(tenantId)){
+				throw new BizException("手机号已被占用");
+			}
 			Organization organization = organDao.get(user.getId());
 			if(organization == null){
 				organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + user.getId());
@@ -77,7 +80,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
 					sysUserDao.batchAddEmployeeRole(user.getId(),sysUser.getRoles());
 				}
-				user.setUserType(user.getUserType() + ",ORGAN");
+				if(!user.getUserType().contains("SYSTEM")){
+					user.setUserType(user.getUserType() + ",SYSTEM");
+				}
 				user.setRealName(organ.getName());
 				user.setPhone(organ.getContactPhone());
 				sysUserDao.update(user);
@@ -90,7 +95,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 			return;
 		}
 		sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
-		sysUser.setUserType("ORGAN");
+		sysUser.setUserType("SYSTEM");
 		sysUser.setRealName(organ.getName());
 		sysUser.setPhone(organ.getContactPhone());
 		sysUserDao.insert(sysUser);

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

@@ -67,7 +67,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             Student stu = studentDao.get(user.getId());
             if (stu == null) {
                 student.setUserId(user.getId());
-                student.setTenantId(user.getTenantId());
+//                student.setTenantId(user.getTenantId());
                 studentDao.insert(student);
                 sysUser.setId(user.getId());
                 sysUser.setUserType(user.getUserType() + ",STUDENT");
@@ -78,7 +78,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             return;
         }
         Organization organization = organizationService.get(student.getOrganId());
-        student.setTenantId(organization.getTenantId());
+//        student.setTenantId(organization.getTenantId());
         sysUser.setTenantId(organization.getTenantId());
         sysUser.setUserType("STUDENT");
         sysUserDao.insert(sysUser);

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

@@ -49,6 +49,9 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
 		teacher.setTenantId(tenantId);
 		sysUser.setTenantId(tenantId);
 		if(user != null && user.getId() != null){
+			if(!user.getTenantId().equals(tenantId)){
+				throw new BizException("手机号已被占用");
+			}
 			Integer id = user.getId();
 			sysUser.setId(id);
 			Teacher teacher1 = teacherDao.get(id);

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

@@ -7,9 +7,11 @@ 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.OrganizationDao;
 import com.keao.edu.user.dao.SysUserDao;
 import com.keao.edu.user.dao.TenantInfoDao;
+import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.Organization;
 import com.keao.edu.user.entity.TenantInfo;
 import com.keao.edu.user.service.TenantInfoService;
@@ -31,6 +33,8 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 	private OrganizationDao organizationDao;
 	@Autowired
 	private ImFeignService imFeignService;
+	@Autowired
+	private EmployeeDao employeeDao;
 
 	@Override
 	public BaseDAO<Integer, TenantInfo> getDAO() {
@@ -52,7 +56,7 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 		SysUser sysUser = new SysUser();
 		sysUser.setTenantId(tenantInfo.getId().toString());
 		sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
-		sysUser.setUserType("ORGAN");
+		sysUser.setUserType("SYSTEM");
 		sysUser.setRealName(tenantInfo.getName());
 		sysUser.setAvatar(tenantInfo.getLogoUrl());
 		sysUser.setPhone(tenantInfo.getContactPhone());
@@ -66,6 +70,12 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 		organ.setId(sysUser.getId());
 		organizationDao.insert(organ);
 
+		Employee employee = new Employee();
+		employee.setOrganId(organ.getId());
+		employee.setUserId(sysUser.getId());
+		employee.setTenantId(tenantInfo.getId().toString());
+		employeeDao.insert(employee);
+
 		ImResult imResult = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getRealName(),null));
 		sysUser.setImToken(imResult.getToken());
 		sysUserDao.update(sysUser);