Merge branch 'lixuetao'

adc-da-login/src/main/java/com/adc/da/login/rest/LoginRestController.java

@@ -350,7 +350,9 @@ public class LoginRestController {
                 CacheUtils.putShiroSessionCache(userEO.getUsid(), session.getId());
             }
 
-            return Result.success(beanMapper.map(returnEO, UserVO.class));
+            ResponseMessage<UserVO> result = Result.success(beanMapper.map(returnEO, UserVO.class));
+            result.getData().setSessionId(session.getId());
+            return result;
 
         } catch (CaptchaException e) {
             log.info("验证码验证失败");
@@ -506,12 +508,12 @@ public class LoginRestController {
     @ResponseBody
     @ApiOperation(value = "SSO，根据Code返回用户信息")
     public ResponseMessage ssoLogin(String code, HttpServletRequest request){
-//        if (StrUtil.isBlank(code)) {
+        if (StrUtil.isBlank(code)) {
-//            return Result.error("无法单点登录，code为空");
+            return Result.error("无法单点登录，code为空");
-//        }
+        }
-//        String username = userService.ssoLogin(code);
+        String username = userService.ssoLogin(code);
 
-        UsernamePasswordToken token = new UsernamePasswordToken("chh");
+        UsernamePasswordToken token = new UsernamePasswordToken(username);
 
         return login(request, token);
     }

adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java

@@ -152,8 +152,8 @@ public class ReportManageConroller {
         if (count1 > 0){
             return Result.error("报告名称已流程中存在");
         }
-        //有报告id说明不是新增报告 走得不是新增流程
+        // 非新增流程
-        if(StringUtils.isNotEmpty(vo.getId())){
+        if(!"4".equals(vo.getPrcType())){
             long count2 = reportDao.selectByReportId(vo.getId());
             if (count2==0){
                 return Result.error("报告已经不存在");
@@ -284,6 +284,7 @@ public class ReportManageConroller {
         return Result.success();
     }
 
+    // TODO 测试完不需要的代码请删掉,然后再把这个TODO也删掉
     /**
      * 测试
      */
@@ -294,6 +295,8 @@ public class ReportManageConroller {
         stringRedisTemplate.boundValueOps("1121212").set("1212");
 
     }
+
+    // TODO 测试完不需要的代码请删掉,然后再把这个TODO也删掉
     @ApiOperation("testPath")
     @GetMapping("/testPath")
     @Deprecated

adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java

@@ -134,4 +134,6 @@ public class ReportVo {
      */
     private Integer isAct;
 
+    private String prcType;
+
 }

adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java

@@ -56,4 +56,6 @@ public class UserVO {
     private List<OrgEO> orgEOList = new ArrayList();
 
     private String employeeTypeId;
+
+    private String sessionId;
 }

report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java

@@ -19,10 +19,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
 
 @Service
 public class ActivitDefineService {
@@ -98,6 +95,7 @@ public class ActivitDefineService {
             //上传
             TtReportManageAct ttReportManageAct = JSONObject.parseObject(dataJson, TtReportManageAct.class);
             ttReportManageAct.setDataId(reportId);
+            ttReportManageAct.setReportId(reportId);
             ttReportManageAct.setTaskId(taskId);
             ttReportManageAct.setPrcId(prcId);
             ttReportManageAct.setDelFlag(0);