Merge remote-tracking branch 'origin/master'

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

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -409,7 +409,7 @@ public class RoomServiceImpl implements RoomService {
             }
         }
         userDao.deleteByUid(userId);
-        this.signOut(Long.parseLong(roomId));
+//        this.signOut(Long.parseLong(roomId));
         return true;
     }
 

edu-im/edu-im-server/src/main/resources/logback-spring.xml

@@ -27,8 +27,8 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.keao.edu" level="DEBUG" />
-	<root level="DEBUG">
+	<logger name="com.keao.edu" level="INFO" />
+	<root level="INFO">
 		<appender-ref ref="stdout" />
 		<appender-ref ref="file" />
 	</root>

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

@@ -35,7 +35,7 @@ public interface EduUserFeignService {
 	 * @param studentId
 	 * @return
 	 */
-	@GetMapping(value = "roomStudentRelation/get")
+	@PostMapping(value = "examRoomStudentRelation/getExamRoomStudentRelation")
 	ExamRoomStudentRelation getExamRoomStudentRelation(@RequestParam("basicId") Integer basicId, @RequestParam("roomId") String roomId, @RequestParam("studentId") Integer studentId);
 
 	@GetMapping("task/queryPaymentStatus")

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

@@ -41,7 +41,7 @@ public class ExamRoomStudentRelationController extends BaseController {
     }
 
     @ApiOperation("获取教室学员关联")
-    @GetMapping(value = "/getExamRoomStudentRelation")
+    @PostMapping(value = "/getExamRoomStudentRelation")
     public ExamRoomStudentRelation getExamRoomStudentRelation(Integer basicId, String roomId, Integer studentId) {
         return examRoomStudentRelationService.getExamRoomStudentRelation(basicId,roomId,studentId);
     }

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

@@ -59,4 +59,11 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @return
 	 */
     Set<Integer> queryRoleIds(Integer userId);
+
+	/**
+	 * 修改userType
+	 * @param userId
+	 * @param userType
+	 */
+	void updateUserType(@Param("userId") Integer userId, @Param("userType") String userType);
 }

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.entity.ExamRegistration;
 import com.keao.edu.user.service.EmployeeService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +51,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 			if(!user.getTenantId().equals(tenantId)){
 				throw new BizException("手机号已被占用");
 			}
-			if(user.getUserType().contains("SYSTEM")){
+			if(StringUtils.isNotEmpty(user.getUserType()) && user.getUserType().contains("SYSTEM")){
 				throw new BizException("手机号已被占用");
 			}
 			Employee employee1 = employeeDao.get(user.getId());
@@ -71,13 +70,18 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 			}else if(employee1.getDelFlag()){
 				SysUser sysUser1 = employee1.getSysUser();
 				if(StringUtils.isEmpty(sysUser1.getUserType())){
-					sysUser1.setUserType("SYSTEM");
+					sysUser.setUserType("SYSTEM");
 				}else {
-					sysUser1.setUserType(sysUser1.getUserType() + ",SYSTEM");
+					sysUser.setUserType(sysUser1.getUserType() + ",SYSTEM");
 				}
-				sysUserDao.update(sysUser1);
-				employee1.setDelFlag(false);
-				employeeDao.update(employee1);
+				if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
+					sysUserDao.batchAddEmployeeRole(sysUser1.getId(),sysUser.getRoles());
+				}
+				sysUser.setId(sysUser1.getId());
+				sysUserDao.update(sysUser);
+				employee.setUserId(sysUser1.getId());
+				employee.setDelFlag(false);
+				employeeDao.update(employee);
 			}else{
 				throw new BizException("用户已存在");
 			}
@@ -101,6 +105,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 	@Transactional(rollbackFor = Exception.class)
 	public void updateEmployee(Employee employee) {
 		SysUser sysUser = employee.getSysUser();
+		sysUser.setId(employee.getUserId());
 		if(null == employeeDao.get(sysUser.getId())){
 			throw new BizException("员工信息不存在");
 		}
@@ -123,7 +128,12 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void del(Integer id) {
+		SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
 		Employee employee = employeeDao.get(id);
+		if(queryUserInfo.getId().equals(employee.getUserId())){
+			throw new BizException("删除失败：不支持此操作");
+		}
+
 		SysUser sysUser = employee.getSysUser();
 		String userType = sysUser.getUserType();
 		if(userType.contains(",SYSTEM")){
@@ -133,8 +143,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 		}else {
 			sysUser.setUserType("");
 		}
-		sysUser.setUserType(userType);
-		sysUserDao.update(sysUser);
+		sysUserDao.updateUserType(sysUser.getId(),sysUser.getUserType());
 		sysUserDao.delEmployeeRole(employee.getUserId());
 		employeeDao.delete(id);
 	}

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

@@ -9,9 +9,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.ExamOrganizationRelationDao;
 import com.keao.edu.user.dao.OrganizationDao;
 import com.keao.edu.user.dao.SysUserDao;
+import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.Organization;
 import com.keao.edu.user.enums.YesOrNoEnum;
 import com.keao.edu.user.service.OrganizationService;
@@ -37,6 +39,8 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	@Autowired
 	private SysUserDao sysUserDao;
 	@Autowired
+	private EmployeeDao employeeDao;
+	@Autowired
 	private ExamOrganizationRelationDao examOrganizationRelationDao;
 
 	@Override
@@ -68,7 +72,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 			if(!user.getTenantId().equals(tenantId)){
 				throw new BizException("手机号已被占用");
 			}
-			if(user.getUserType().contains("SYSTEM")){
+			if(StringUtils.isNotEmpty(user.getUserType()) && user.getUserType().contains("SYSTEM")){
 				throw new BizException("手机号已被占用");
 			}
 			Organization organization = organDao.get(user.getId());
@@ -92,13 +96,21 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 			}else if(organization.getDelFlag() == YesOrNoEnum.YES){
 				SysUser sysUser1 = organization.getSysUser();
 				if(StringUtils.isEmpty(sysUser1.getUserType())){
-					sysUser1.setUserType("SYSTEM");
+					sysUser.setUserType("SYSTEM");
 				}else {
-					sysUser1.setUserType(sysUser1.getUserType() + ",SYSTEM");
+					sysUser.setUserType(sysUser1.getUserType() + ",SYSTEM");
+				}
+				sysUser.setId(sysUser1.getId());
+				sysUserDao.update(sysUser);
+				if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
+					sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
 				}
-				sysUserDao.update(sysUser1);
-				organization.setDelFlag(YesOrNoEnum.NO);
-				organDao.update(organization);
+				Employee employee = employeeDao.get(sysUser.getId());
+				employee.setDelFlag(false);
+				employeeDao.update(employee);
+				organ.setDelFlag(YesOrNoEnum.NO);
+				organ.setId(organization.getId());
+				organDao.update(organ);
 			}else{
 				throw new BizException("用户已存在");
 			}
@@ -118,6 +130,12 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
 			sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
 		}
+		Employee employee = new Employee();
+		employee.setOrganId(organ.getId());
+		employee.setUserId(sysUser.getId());
+		employee.setTenantId(tenantId);
+		employeeDao.insert(employee);
+
 		ImResult imResult = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getRealName(),null));
         sysUser.setImToken(imResult.getToken());
 		sysUserDao.update(sysUser);
@@ -127,10 +145,11 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	@Transactional(rollbackFor = Exception.class)
 	public void updateOrganization(Organization organization) {
 		SysUser sysUser = organization.getSysUser();
-		sysUser.setId(organization.getUserId());
-		if(null == organDao.get(sysUser.getId())){
+		Organization organization1 = organDao.get(organization.getId());
+		if(null == organization1){
 			throw new BizException("合作商信息不存在");
 		}
+		sysUser.setId(organization1.getUserId());
 //		organization.setId(sysUser.getId());
 		if(StringUtils.isNotEmpty(sysUser.getPhone())){
 			SysUser queryByPhone = sysUserDao.queryByPhone(sysUser.getPhone());
@@ -205,8 +224,12 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void del(Integer id) {
-		Integer count = examOrganizationRelationDao.findByOrganId(id);
 		Organization organization = organDao.get(id);
+		SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
+		if(queryUserInfo.getId().equals(organization.getUserId())){
+			throw new BizException("删除失败：不支持此操作");
+		}
+		Integer count = examOrganizationRelationDao.findByOrganId(id);
 		if(count == null || count == 0){
 			SysUser sysUser = organization.getSysUser();
 			String userType = sysUser.getUserType();
@@ -217,10 +240,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 			}else {
 				sysUser.setUserType("");
 			}
-			sysUser.setUserType(userType);
-			sysUserDao.update(sysUser);
-
+			sysUserDao.updateUserType(sysUser.getId(),sysUser.getUserType());
 			sysUserDao.delEmployeeRole(organization.getUserId());
+			employeeDao.delete(sysUser.getId());
 			organDao.delete(id);
 		}else {
 			throw new BizException("删除失败：存在考试项目,无法删除");

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

@@ -94,6 +94,9 @@
             <if test="organId != null">
                 organ_id_=#{organId},
             </if>
+			<if test="delFlag != null">
+				del_flag_ = #{delFlag},
+			</if>
             update_time_ = NOW()
         </set> WHERE user_id_ = #{userId}
 	</update>

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

@@ -140,11 +140,15 @@
                 real_name_ = #{realName},
             </if>
             <if test="isSuperAdmin != null">
-                is_super_admin_ = #{isSuperAdmin}
+                is_super_admin_ = #{isSuperAdmin},
             </if>
+            update_time_ = NOW()
         </set>
         WHERE id_ = #{id}
     </update>
+    <update id="updateUserType">
+        UPDATE sys_user SET user_type_ = #{userType},update_time_ = NOW() WHERE id_ = #{userId}
+    </update>
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
 		UPDATE sys_user SET del_flag_ = 1 WHERE id_ = #{id}

edu-user/edu-user-server/src/main/resources/logback-spring.xml

@@ -27,10 +27,10 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.keao.edu" level="DEBUG" />
+	<logger name="com.keao.edu" level="INFO" />
 
 	<!--开发环境:打印控制台 -->
-		<root level="DEBUG">
+		<root level="INFO">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />
 		</root>