增加老师申请时监测逻辑

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSecurityApplyController.java

@@ -5,6 +5,8 @@ import java.util.*;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zd.laboratory.domain.LabWhitelist;
+import com.zd.laboratory.service.*;
 import com.zd.model.constant.UserConstants;
 import com.zd.model.domain.R;
 import com.zd.model.domain.per.PerFun;
@@ -28,10 +30,6 @@ import com.zd.laboratory.domain.LabSubject;
 import com.zd.laboratory.domain.vo.LabSecurityApplyExcelVO;
 import com.zd.laboratory.domain.vo.LabSecurityApplyVO;
 import com.zd.laboratory.domain.vo.LabSecurityMaterialDataVO;
-import com.zd.laboratory.service.ILabSecurityApplyService;
-import com.zd.laboratory.service.ILabSecurityMaterialDataService;
-import com.zd.laboratory.service.ILabSecurityMaterialrelationService;
-import com.zd.laboratory.service.ILabSubjectService;
 import com.zd.system.api.feign.RemoteUserService;
 import com.zd.model.entity.SysUser;
 import io.swagger.annotations.Api;
@@ -81,6 +79,9 @@ public class LabSecurityApplyController extends BaseController
     @Autowired
     private ILabSubjectService labSubjectService;
 
+    @Autowired
+    private ILabWhitelistService labWhitelistService;
+
     /**
      * 查询安全准入申请列表
      */
@@ -759,7 +760,21 @@ public class LabSecurityApplyController extends BaseController
     @GetMapping(value = "/getValidApply")
     public ResultData  selectValidApply( LabSecurityApply labSecurityApply)
     {
-        List<LabSecurityApply> list = labSecurityApplyService.selectValidApply(labSecurityApply);
-        return ResultData.success(list);
+        //获取登录用户信息
+        SysUser sysUser = tokenService.getLoginUser().getSysUser();
+        if("11".equals(sysUser.getUserType())){
+            //老师查看白名单
+            LabWhitelist whitelist = new LabWhitelist();
+            whitelist.setUserId(labSecurityApply.getUserId());
+            List<LabWhitelist> list = labWhitelistService.selectLabWhitelistList(whitelist);
+            return ResultData.success(list);
+        }else if("22".equals(sysUser.getUserType())){
+            //学生查看安全准入申请
+            List<LabSecurityApply> list = labSecurityApplyService.selectValidApply(labSecurityApply);
+            return ResultData.success(list);
+        }else {
+            return ResultData.success(new ArrayList<>());
+        }
+
     }
 }