Merge remote-tracking branch 'origin/master'

edu-cms/src/main/java/com/keao/edu/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -5,11 +5,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.keao.edu.cms.controller.queryinfo.NewsInformationQueryInfo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import com.keao.edu.cms.controller.queryinfo.NewsInformationQueryInfo;
 import com.keao.edu.cms.dal.dao.SysNewsInformationDao;
 import com.keao.edu.cms.dal.entity.NewsStatusEnum;
 import com.keao.edu.cms.dal.entity.SysNewsInformation;
@@ -26,13 +25,6 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 	@Autowired
 	private SysNewsInformationDao sysNewsInformationDao;
 	
-	@Value("${user.server.context.path}")
-	private String serverContextPath;
-	
-	public void setServerContextPath(String serverContextPath) {
-		this.serverContextPath = serverContextPath;
-	}
-
 	@Override
 	public BaseDAO<Long, SysNewsInformation> getDAO() {
 		return sysNewsInformationDao;

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

@@ -57,8 +57,8 @@ public class TeacherController extends BaseController {
 	@ApiOperation(value = "删除教师")
 	@PostMapping(value = "del")
     @PreAuthorize("@pcs.hasPermissions('teacher/del')")
-	public HttpResponseResult<Teacher> del(Integer id) {
-		teacherService.delete(id);
+	public HttpResponseResult del(Integer id) {
+		teacherService.del(id);
 		return succeed();
 	}
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/enums/ExamEvaluationResultEnum.java

@@ -8,7 +8,7 @@ import com.keao.edu.common.enums.BaseEnum;
  **/
 public enum ExamEvaluationResultEnum implements BaseEnum<String, ExamEvaluationResultEnum> {
 
-    EXCELLENT("excellent", "优秀"),
+    EXCELLENT("EXCELLENT", "优秀"),
     WELL("WELL", "良好"),
     PASS("PASS", "及格"),
     FAIL("FAIL", "不及格");

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

@@ -21,4 +21,6 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
     void updateTeacher(Teacher teacher);
 
     PageInfo<Teacher> queryTeacherPage(TeacherQueryInfo queryInfo);
+
+    void del(Integer id);
 }

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

@@ -141,9 +141,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 		}else if(userType.contains("SYSTEM,")){
 			userType.replace("SYSTEM,","");
 		}else {
-			sysUser.setUserType("");
+			userType = "";
 		}
-		sysUserDao.updateUserType(sysUser.getId(),sysUser.getUserType());
+		sysUserDao.updateUserType(sysUser.getId(),userType);
 		sysUserDao.delEmployeeRole(employee.getUserId());
 		employeeDao.delete(id);
 	}

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

@@ -12,6 +12,7 @@ import com.keao.edu.im.api.entity.ImResult;
 import com.keao.edu.im.api.entity.ImUserModel;
 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.enums.YesOrNoEnum;
 import com.keao.edu.user.page.TeacherQueryInfo;
@@ -62,10 +63,20 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
 			if(teacher1 == null || teacher1.getUserId() == null){
 				teacher.setUserId(id);
 				teacherDao.insert(teacher);
-				sysUser.setUserType(user.getUserType() + ",TEACHER");
+				if(StringUtils.isEmpty(user.getUserType())){
+					sysUser.setUserType("TEACHER");
+				}else {
+					sysUser.setUserType(user.getUserType() + ",TEACHER");
+				}
 				sysUser.setUpdateTime(date);
 				sysUserDao.update(sysUser);
 			}else if (teacher1.getDelFlag() == YesOrNoEnum.YES){
+				if(StringUtils.isEmpty(user.getUserType())){
+					sysUser.setUserType("TEACHER");
+				}else {
+					sysUser.setUserType(user.getUserType() + ",TEACHER");
+				}
+				sysUserDao.update(sysUser);
 				teacher.setDelFlag(YesOrNoEnum.NO);
 				teacherDao.update(teacher);
 			}else {
@@ -74,12 +85,12 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
 			return id;
 		}
 		sysUser.setUserType("TEACHER");
-//		sysUser.setUsername(sysUser.getRealName());
+
 		sysUserDao.insert(sysUser);
 		Integer userId = sysUser.getId();
 		teacher.setUserId(userId);
 		teacherDao.insert(teacher);
-		ImResult imResult = imFeignService.register(new ImUserModel(userId.toString(), sysUser.getUsername(), sysUser.getAvatar()));
+		ImResult imResult = imFeignService.register(new ImUserModel(userId.toString(), sysUser.getRealName(), sysUser.getAvatar()));
 		if(imResult != null){
 			sysUser.setImToken(imResult.getToken());
 			sysUserDao.update(sysUser);
@@ -132,4 +143,24 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
 		pageInfo.setRows(dataList);
 		return pageInfo;
 	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void del(Integer id) {
+		SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
+		Teacher teacher = teacherDao.get(id);
+		if(queryUserInfo.getId().equals(teacher.getUserId())){
+			throw new BizException("删除失败：不支持此操作");
+		}
+		String userType = teacher.getSysUser().getUserType();
+		if(userType.contains(",TEACHER")){
+			userType.replace(",TEACHER","");
+		}else if(userType.contains("TEACHER,")){
+			userType.replace("TEACHER,","");
+		}else {
+			userType = "";
+		}
+		sysUserDao.updateUserType(teacher.getUserId(),userType);
+		teacherDao.delete(id);
+	}
 }

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

@@ -130,7 +130,7 @@
             <if test="idCardNo != null">
                 id_card_no_ = #{idCardNo},
             </if>
-            <if test="password != null">
+            <if test="password != null and password != ''">
                 password_ = #{password},
             </if>
             <if test="wechatId != null">