2022-9-20 10:41:00 分析系统提交代码

PAS/src/main/java/cn/cslg/pas/common/utils/SecurityUtils/LoginUtils.java

@@ -2,20 +2,13 @@ package cn.cslg.pas.common.utils.SecurityUtils;
 
 import cn.cslg.pas.common.utils.RedisUtil;
 import cn.cslg.pas.common.utils.StringUtils;
-import cn.hutool.core.io.FileUtil;
-import io.swagger.v3.oas.models.security.SecurityScheme;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.system.ApplicationHome;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import org.thymeleaf.expression.Ids;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
 import java.util.List;
 
 @Component

PAS/src/main/java/cn/cslg/pas/service/OAuth2Service.java

@@ -79,7 +79,6 @@ public class OAuth2Service {
             }
             result.put(projectId, userType);
         }
-        redisUtil.set("Permission"+loginUtils.getId(),JsonUtils.objectToJson(result));
         return result;
     }
 
@@ -161,8 +160,8 @@ public class OAuth2Service {
                 .build();
         String resBody = okHttpClient.newCall(request).execute().body().string();
         JSONObject jsonObject = JSONObject.parseObject(resBody);
-         //判断请求返回是否为200，不是的话则返回报错信息
-        if(!jsonObject.get("code").equals(200)){
+        //判断请求返回是否为200，不是的话则返回报错信息
+        if (!jsonObject.get("code").equals(200)) {
             return Response.error(jsonObject.get("message").toString());
 
         }

PAS/src/main/java/cn/cslg/pas/service/ProjectService.java

@@ -137,7 +137,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         try {
             //获取所属部门对应信息
             Map<String, Object> map = new HashMap<>();
-            map.put("departmentId", dataList.stream().map(Project::getDepartmentId).collect(Collectors.toList()));
+            map.put("departmentId", dataList.stream().map(Project::getDepartmentId).filter(Objects::nonNull).collect(Collectors.toList()));
             String jsonObject = apiUtils.invokeApi(new JSONObject(map), "/permission/api/system/getDepartmentById", "post", "data");
             JSONArray jsonArray1 = JSON.parseArray(jsonObject);
             List<ProjectVO.Department> departmentList = jsonArray1.toJavaList(ProjectVO.Department.class);