BJ_ZTEITS-Developers / zteits-oa

Commit 04bcc6f51f4edc91f2cc8d2fba5939c6a039ad70

Authored by 王富生
1 parent 48c99f2e

提交session 为空判断

Inline Side-by-side
Showing 3 changed files with 11 additions and 5 deletions
src/main/java/com/zteits/oa/configuration/WebMvcConfig.java
  View file @04bcc6f
... ... @@ -8,9 +8,9 @@ import org.springframework.context.annotation.Configuration;
8 8 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
9 9 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
10 10 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
11   -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
12 11  
13 12 import com.zteits.oa.configuration.auth.AuthInterceptor;
  13 +import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
14 14  
15 15 @Configuration
16 16 @EnableWebMvc
... ... @@ -23,8 +23,6 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter {
23 23 return new AuthInterceptor();
24 24 }
25 25  
26   -
27   -
28 26  
29 27 @Override
30 28 public void addResourceHandlers(ResourceHandlerRegistry registry) {
... ...
src/main/java/com/zteits/oa/configuration/auth/AuthInterceptor.java
  View file @04bcc6f
... ... @@ -13,7 +13,6 @@ import org.springframework.http.HttpStatus;
13 13 import org.springframework.stereotype.Component;
14 14 import org.springframework.util.CollectionUtils;
15 15 import org.springframework.web.method.HandlerMethod;
16   -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
17 16  
18 17 import com.alibaba.fastjson.JSONObject;
19 18 import com.zteits.oa.api.base.annotation.NoAuth;
... ... @@ -21,6 +20,7 @@ import com.zteits.oa.api.base.bean.BizResult;
21 20 import com.zteits.oa.api.base.constants.ErrorType;
22 21 import com.zteits.oa.api.base.constants.SessionEnum;
23 22 import com.zteits.oa.api.dto.asraop.LoginOathRes;
  23 +import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
24 24  
25 25 /**
26 26 * Copyright: Copyright (c) 2017 zteits
... ... @@ -121,4 +121,3 @@ public class AuthInterceptor extends HandlerInterceptorAdapter {
121 121  
122 122 }
123 123  
124   -
... ...
src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java
  View file @04bcc6f
... ... @@ -98,6 +98,15 @@ public class AsraDailyQueryServiceImpl implements AsraDailyQueryService {
98 98 BeanUtils.copyProperties(asraDailyDO, asraProjectAndPersonNumDTO);
99 99 if(!personNumDTOList.contains(asraProjectAndPersonNumDTO)){
100 100 personNumDTOList.add(asraProjectAndPersonNumDTO);
  101 + }else{
  102 + for (AsraProjectAndPersonNumDTO getAsraProjectAndPersonNumDTO:personNumDTOList){
  103 + if(getAsraProjectAndPersonNumDTO == null){
  104 + continue;
  105 + }
  106 + if(getAsraProjectAndPersonNumDTO.getProjectId().equals(asraDailyDO.getProjectId())){
  107 + getAsraProjectAndPersonNumDTO.setCommitPersonNum(getAsraProjectAndPersonNumDTO.getCommitPersonNum()+asraDailyDO.getCommitPersonNum());
  108 + }
  109 + }
101 110 }
102 111 }
103 112 //2.添加明细
... ...