前端老师用户返回学校和班级信息显示

ie-admin/src/main/java/com/ruoyi/web/controller/front/UserController.java

@@ -18,18 +18,10 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.enums.ExamType;
 import com.ruoyi.common.utils.NumberUtils;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.dz.domain.DzAgent;
-import com.ruoyi.dz.domain.DzCards;
-import com.ruoyi.dz.domain.DzClasses;
-import com.ruoyi.dz.domain.DzControl;
-import com.ruoyi.dz.domain.DzSchool;
+import com.ruoyi.dz.domain.*;
 import com.ruoyi.dz.mapper.DzClassesMapper;
 import com.ruoyi.dz.mapper.DzSchoolMapper;
-import com.ruoyi.dz.service.IDzAgentService;
-import com.ruoyi.dz.service.IDzCardsService;
-import com.ruoyi.dz.service.IDzClassesService;
-import com.ruoyi.dz.service.IDzControlService;
-import com.ruoyi.dz.service.IDzSchoolService;
+import com.ruoyi.dz.service.*;
 import com.ruoyi.enums.CardDistributeStatus;
 import com.ruoyi.enums.CardStatus;
 import com.ruoyi.enums.UserTypeEnum;
@@ -43,6 +35,7 @@ import com.ruoyi.web.service.SysLoginService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -71,8 +64,9 @@ public class UserController extends BaseController {
     private final DzClassesMapper dzClassesMapper;
     private final IDzAgentService agentService;
     private final ISysDeptService deptService;
+    private final IDzTeacherService dzTeacherService;
 
-    public UserController(IDzControlService dzControlService, SysLoginService loginService, ISysUserService userService, SysPermissionService permissionService, TokenService tokenService, CommService commService, ISysConfigService configService, IDzCardsService dzCardsService, IDzSchoolService dzSchoolService, IDzClassesService dzClassesService, DzSchoolMapper dzSchoolMapper, DzClassesMapper dzClassesMapper, IDzAgentService agentService, ISysDeptService deptService) {
+    public UserController(IDzControlService dzControlService, SysLoginService loginService, ISysUserService userService, SysPermissionService permissionService, TokenService tokenService, CommService commService, ISysConfigService configService, IDzCardsService dzCardsService, IDzSchoolService dzSchoolService, IDzClassesService dzClassesService, DzSchoolMapper dzSchoolMapper, DzClassesMapper dzClassesMapper, IDzAgentService agentService, ISysDeptService deptService, IDzTeacherService dzTeacherService) {
         this.dzControlService = dzControlService;
         this.loginService = loginService;
         this.userService = userService;
@@ -87,6 +81,7 @@ public class UserController extends BaseController {
         this.dzClassesMapper = dzClassesMapper;
         this.agentService = agentService;
         this.deptService = deptService;
+        this.dzTeacherService = dzTeacherService;
     }
 
     @GetMapping(value = "provinces")
@@ -240,6 +235,25 @@ public class UserController extends BaseController {
             loginUser.setPermissions(permissions);
             tokenService.refreshToken(loginUser);
         }
+        DzTeacher dzTeacher;
+        if(UserTypeEnum.isTeacher(user.getUserType()) && null != (dzTeacher = dzTeacherService.selectDzTeacherByTeacherId(user.getUserTypeId()))) {
+            user.setSchoolId(dzTeacher.getSchoolId());
+            user.setSchoolName(dzTeacher.getSchoolName());
+            if(null != dzTeacher.getCampusId()) {
+                user.setCampusName(dzSchoolMapper.selectDzSchoolById(user.getSchoolId()).getName());
+            }
+            List<String> campusClassList = Lists.newArrayList();
+            List<String> schoolClassList = Lists.newArrayList();
+            for(DzClasses dzClass : dzClassesMapper.selectClassesForTeacher(dzTeacher.getTeacherId())) {
+                if(null == dzClass.getDeptId()) {
+                    schoolClassList.add(dzClass.getName());
+                } else {
+                    campusClassList.add(dzClass.getName());
+                }
+            }
+            user.setSchoolClassName(StringUtils.join(schoolClassList, ","));
+            user.setCampusClassName(StringUtils.join(campusClassList, ","));
+        }
         AjaxResult ajax = AjaxResult.success(user);
         ajax.put("card", loginUser.getCard());
         ajax.put("roles", roles);

ie-admin/src/main/java/com/ruoyi/web/controller/system/SysAreaController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.system;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.page.TableDataInfo;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -49,6 +50,7 @@ public class SysAreaController extends BaseController
 
     @GetMapping("list/tree")
     @Operation(summary = "树形结构")
+    @Anonymous
     public TableDataInfo listTree(SysArea criteria) {
         List<SysArea> data = sysAreaService.listTree(criteria);
         return getDataTable(data);

ie-system/src/main/java/com/ruoyi/dz/service/impl/DzCardsServiceImpl.java

@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.dz.service.IDzCardsService;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.validation.ValidationException;
 
@@ -242,6 +243,12 @@ public class DzCardsServiceImpl implements IDzCardsService
         cond.setType(cardType.getVal());
         cond.setStartNo(beginNo);
         cond.setEndNo(endNo);
+
+        List<DzCards> list = dzCardsMapper.selectListByCond(cond);
+        if(CollectionUtils.isEmpty(list)) {
+            throw new ValidationException("卡类型与卡号不一致或卡号不正确");
+        }
+
         DzCards dzCards = new DzCards();
 
         DzCardsOpen newOpen = new DzCardsOpen();
@@ -257,7 +264,7 @@ public class DzCardsServiceImpl implements IDzCardsService
         newOpen.setStatus(RequestStatus.Accept.getVal());
         dzCardsOpenMapper.insertDzCardsOpen(newOpen);
 
-        dzCardsMapper.selectListByCond(cond).stream().forEach(c -> {
+        list.forEach(c -> {
             dzCards.setCardId(c.getCardId());
             if(!CardStatus.Free.getVal().equals(c.getStatus())) {
                 throw new ValidationException("卡分配错误");