20210408v1.4

tall/src/main/java/com/ccsens/tall/service/ProRoleService.java

@@ -258,7 +258,7 @@ public class ProRoleService implements IProRoleService {
 
         //先从userid和项目id获取当前用户的成员id，查看role-show里面是否有这个成员的数据
         ProMemberExample proMemberExample=new ProMemberExample();
-        proMemberExample.createCriteria().andUserIdEqualTo(userId).andProjectIdEqualTo(projectId).andRecStatusEqualTo((byte)0);
+        proMemberExample.createCriteria().andUserIdEqualTo(userId).andProjectIdEqualTo(projectId);
         List<ProMember> proMembers = proMemberMapper.selectByExample(proMemberExample);
         Long memberId=0L;
         if(CollectionUtil.isNotEmpty(proMembers)){
@@ -318,6 +318,7 @@ public class ProRoleService implements IProRoleService {
             if(CollectionUtil.isEmpty(proMemberRoles1)){
                 isPm[0]=false;
             }else {
+
                 isPm[0]=true;
             }
             

tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java

@@ -468,7 +468,8 @@ public class TaskDeliverService implements ITaskDeliverService {
                 if("1".equalsIgnoreCase(filePath.getIsHistory())){
                     filePath.setDeleteTime(filePath.getUpdateTime().getTime());
                 }
-                //修改文件路径为可下载路径
+                // TODO 修改文件路径为可下载路径
+
                 if(StrUtil.isNotEmpty(filePath.getUrl())) {
 //                    filePath.setUrl(WebConstant.TEST_URL_BASE + filePath.getUrl());
                     filePath.setUrl(PropUtil.imgDomain + "/" + filePath.getUrl());

tall/src/main/java/com/ccsens/tall/web/DeliverController.java

@@ -91,20 +91,20 @@ public class DeliverController {
         return JsonResponse.newInstance().ok(deliverInfo);
     }
 
-    @ApiOperation(value = "查看输入文档的详细信息",notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name="inputId",value = "输入文档Id",required = true,paramType = "query",dataType="String"),
-            @ApiImplicitParam(name="taskId",value = "任务Id",required = true,paramType = "query",dataType="String")
-    })
-    @RequestMapping(value = "input", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<DeliverVo.DeliverInfo> selectInput(HttpServletRequest request,
-                                                           @RequestParam(required = true)Long inputId, Long taskId) throws Exception {
-        Long currentUserId =  Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
-        String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
-        String token = authHeader.substring(WebConstant.HEADER_KEY_TOKEN_PREFIX.length());
-        DeliverVo.DeliverInfo deliverInfo = deliverService.selectDeliverInfo(currentUserId,inputId,taskId,token);
-        return JsonResponse.newInstance().ok(deliverInfo);
-    }
+//    @ApiOperation(value = "查看输入文档的详细信息",notes = "")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name="inputId",value = "输入文档Id",required = true,paramType = "query",dataType="String"),
+//            @ApiImplicitParam(name="taskId",value = "任务Id",required = true,paramType = "query",dataType="String")
+//    })
+//    @RequestMapping(value = "input", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
+//    public JsonResponse<DeliverVo.DeliverInfo> selectInput(HttpServletRequest request,
+//                                                           @RequestParam(required = true)Long inputId, Long taskId) throws Exception {
+//        Long currentUserId =  Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
+//        String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
+//        String token = authHeader.substring(WebConstant.HEADER_KEY_TOKEN_PREFIX.length());
+//        DeliverVo.DeliverInfo deliverInfo = deliverService.selectDeliverInfo(currentUserId,inputId,taskId,token);
+//        return JsonResponse.newInstance().ok(deliverInfo);
+//    }
 
     @OperateType(value = 9)
     @ApiOperation(value = "检查人评价交付物",notes = "")