提交session 为空判断

王富生
1 parent 48c99f2e
Showing 3 changed files with 11 additions and 5 deletions
src/main/java/com/zteits/oa/configuration/WebMvcConfig.java
src/main/java/com/zteits/oa/configuration/auth/AuthInterceptor.java
src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java
@@ -8,9 +8,9 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import com.zteits.oa.configuration.auth.AuthInterceptor;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 @Configuration
 @EnableWebMvc
@@ -23,8 +23,6 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter {
         return new AuthInterceptor();
     }
-
-
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
@@ -13,7 +13,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 import com.alibaba.fastjson.JSONObject;
 import com.zteits.oa.api.base.annotation.NoAuth;
@@ -21,6 +20,7 @@ import com.zteits.oa.api.base.bean.BizResult;
 import com.zteits.oa.api.base.constants.ErrorType;
 import com.zteits.oa.api.base.constants.SessionEnum;
 import com.zteits.oa.api.dto.asraop.LoginOathRes;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 /**
  * Copyright: Copyright (c) 2017  zteits
@@ -121,4 +121,3 @@ public class AuthInterceptor extends HandlerInterceptorAdapter {
 }
-
@@ -98,6 +98,15 @@ public class AsraDailyQueryServiceImpl implements AsraDailyQueryService {
 				BeanUtils.copyProperties(asraDailyDO, asraProjectAndPersonNumDTO);
 				if(!personNumDTOList.contains(asraProjectAndPersonNumDTO)){
 					personNumDTOList.add(asraProjectAndPersonNumDTO);
+				}else{
+					for (AsraProjectAndPersonNumDTO getAsraProjectAndPersonNumDTO:personNumDTOList){
+						if(getAsraProjectAndPersonNumDTO == null){
+							continue;
+						}
+						if(getAsraProjectAndPersonNumDTO.getProjectId().equals(asraDailyDO.getProjectId())){
+							getAsraProjectAndPersonNumDTO.setCommitPersonNum(getAsraProjectAndPersonNumDTO.getCommitPersonNum()+asraDailyDO.getCommitPersonNum());
+						}
+					}
 				}
 			}
 			//2.添加明细