src/main/java/com/qxueyou/scc/controller/ClassController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/qxueyou/scc/sys/action/LoginController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/qxueyou/scc/controller/ClassController.java
@@ -12,13 +12,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import com.qxueyou.scc.admin.classes.model.ClsClass; import com.qxueyou.scc.admin.classes.model.ClsSubjectChapter; @@ -48,6 +42,7 @@ */ @Api(tags="班级管理接口") @RestController @CrossOrigin @RequestMapping("/admin/class") public class ClassController { src/main/java/com/qxueyou/scc/sys/action/LoginController.java
@@ -419,6 +419,9 @@ }else if("portal".equals(logType)){ hql = "from User where deleteFlag is false and email = ?"; params = CollectionUtils.newList(account); }else if("zhyly".equals(logType)){ hql = "from User where deleteFlag is false and mobilePhone = ? and creator != '管理员'"; params = CollectionUtils.newList(account); }else{ if(StringUtils.isEmpty(password)) { return new Result(false, "用户密码不能为空"); @@ -491,7 +494,7 @@ // 存到redis redisTemplate.opsForValue().set(UserInfoWrapper.SESSION_USER_INFO_KEY, wrapper); request.getSession().setAttribute(UserInfoWrapper.SESSION_USER_INFO_KEY, wrapper); if ("study".equals(logType) || "portal".equals(logType)) { if ("study".equals(logType) || "portal".equals(logType) || "zhyly".equals(logType)) { /*if (StringUtils.isEmpty(ClientUtils.getClassId()) && user.getRoles() == null) { return new Result(false, "该用户未加入任何班级或未激活,请联系班主任"); }*/