lyhzzz 1 ano atrás
pai
commit
ded7f52e89

+ 17 - 15
src/main/java/com/fdkankan/fusion/service/impl/TmProjectServiceImpl.java

@@ -271,24 +271,26 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
         if(CollectionUtils.isEmpty(idList)){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        List<TmProject> tmProjects = this.listByIds(idList);
-        Set<String> projectDeptIds = tmProjects.stream().map(TmProject::getDeptId).collect(Collectors.toSet());
+        if(commonDto.getStatus() != 1){ //设置教学项目
+            List<TmProject> tmProjects = this.listByIds(idList);
+            Set<String> projectDeptIds = tmProjects.stream().map(TmProject::getDeptId).collect(Collectors.toSet());
 
-        TmUser loginUser = tmUserService.getLoginUser();
-        TmRole tmRole = tmRoleService.getByUserId(loginUser.getId());
-        if(tmRole.getRoleKey().equals(RoleKeyEnum.ADMIN_DEPT.getKey())){
-            List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(loginUser.getDeptId());
-            List<String> deptIds = sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList());
-            for (String projectDeptId : projectDeptIds) {
-                if(!deptIds.contains(projectDeptId)){
-                    throw new BusinessException(ResultCode.NOT_PER);
+            TmUser loginUser = tmUserService.getLoginUser();
+            TmRole tmRole = tmRoleService.getByUserId(loginUser.getId());
+            if(tmRole.getRoleKey().equals(RoleKeyEnum.ADMIN_DEPT.getKey())){
+                List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(loginUser.getDeptId());
+                List<String> deptIds = sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList());
+                for (String projectDeptId : projectDeptIds) {
+                    if(!deptIds.contains(projectDeptId)){
+                        throw new BusinessException(ResultCode.NOT_PER);
+                    }
                 }
             }
-        }
-        if(tmRole.getRoleKey().equals(RoleKeyEnum.ADMIN_ORDINARY.getKey())){
-            for (String projectDeptId : projectDeptIds) {
-                if(projectDeptId.equals(loginUser.getDeptId())){
-                    throw new BusinessException(ResultCode.NOT_PER);
+            if(tmRole.getRoleKey().equals(RoleKeyEnum.ADMIN_ORDINARY.getKey())){
+                for (String projectDeptId : projectDeptIds) {
+                    if(projectDeptId.equals(loginUser.getDeptId())){
+                        throw new BusinessException(ResultCode.NOT_PER);
+                    }
                 }
             }
         }