1

src/main/java/com/fdkankan/fusion/config/SaTokenConfigure.java

@@ -44,7 +44,7 @@ public class SaTokenConfigure {
     public SaServletFilter getSaServletFilter() {
         return new SaServletFilter()
                 // 指定 拦截路由 与 放行路由
-                .addInclude("/**").addExclude("/**/test/**","/**/inner/**","/**/notAuth/**","/**/systemSetting/**","/**/downMD5/**","/**/downDocx/**")
+                .addInclude("/**").addExclude("/**/test/**","/**/inner/**","/**/notAuth/**","/**/systemSetting/**","/**/downMD5/**","/**/downDocx/**","/**/treeselect/**")
                 // 认证函数: 每次请求执行
                 .setAuth(obj -> {
                     String share = SaHolder.getRequest().getHeader("share");

src/main/java/com/fdkankan/fusion/controller/CaseController.java

@@ -3,6 +3,7 @@ package com.fdkankan.fusion.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.entity.TmProject;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.common.ResultData;
@@ -73,6 +74,9 @@ public class CaseController extends BaseController{
         BeanUtil.copyProperties(caseEntity,caseVo);
         if(caseEntity.getTmProjectId() != null){
             TmProject tmProject = tmProjectService.getById(caseEntity.getTmProjectId());
+            if(tmProject!= null && tmProject.getIsDelete()!=0){
+                throw  new BusinessException(ResultCode.CASE_NOT_EXITS);
+            }
             caseVo.setTmProject(tmProject);
             caseVo.setCaseTitle(tmProject.getProjectName());
         }

src/main/java/com/fdkankan/fusion/service/impl/TmDepartmentServiceImpl.java

@@ -125,25 +125,29 @@ public class TmDepartmentServiceImpl extends ServiceImpl<ITmDepartmentMapper, Tm
 
     @Override
     public List<TmDepartment> getDeptList() {
-        String userId  =(String) StpUtil.getLoginId();
-        TmUser tmUser = tmUserService.getById(userId);
-        if(tmUser == null){
-            return new ArrayList<>();
-        }
-        List<TmUserRole> tmUserRoles = tmUserRoleService.getByUserId(tmUser.getId());
-        if(tmUserRoles.size() >0){
-            TmUserRole tmUserRole = tmUserRoles.get(0);
-            TmRole tmRole = tmRoleService.getById(tmUserRole.getRoleId());
-            if(tmRole != null && tmRole.getRoleKey().equals("admin-ordinary")){
-                TmDepartment tmDepartment = this.getById(tmUser.getDeptId());
-                TmDepartment parentDept = this.getById(tmDepartment.getParentId());
-                if(parentDept !=null){
-                    tmDepartment.setParentName(parentDept.getName());
+        if(StpUtil.isLogin()){
+            String userId  =(String) StpUtil.getLoginId();
+            TmUser tmUser = tmUserService.getById(userId);
+            if(tmUser == null){
+                return new ArrayList<>();
+            }
+            List<TmUserRole> tmUserRoles = tmUserRoleService.getByUserId(tmUser.getId());
+            if(tmUserRoles.size() >0){
+                TmUserRole tmUserRole = tmUserRoles.get(0);
+                TmRole tmRole = tmRoleService.getById(tmUserRole.getRoleId());
+                if(tmRole != null && tmRole.getRoleKey().equals("admin-ordinary")){
+                    TmDepartment tmDepartment = this.getById(tmUser.getDeptId());
+                    TmDepartment parentDept = this.getById(tmDepartment.getParentId());
+                    if(parentDept !=null){
+                        tmDepartment.setParentName(parentDept.getName());
+                    }
+                    return Arrays.asList(tmDepartment);
                 }
-                return Arrays.asList(tmDepartment);
             }
+            return getDeptList(tmUser.getDeptId());
+        }else {
+            return getDeptList("0");
         }
-        return getDeptList(tmUser.getDeptId());
     }
 
     public List<TmDepartment> getDeptList(String deptId) {