代码提交

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProblemInitiationServiceImpl.java

@@ -118,7 +118,7 @@ public class ProblemInitiationServiceImpl {
         String taskType = new String();
 
         JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(objectd));
-        AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+        AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
         JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
         ProjectInitiation projectInitiation = new ProjectInitiation();
         projectInitiation.setInstanceId(instanceId);
@@ -526,7 +526,7 @@ public class ProblemInitiationServiceImpl {
             dto1.setResult(status);
             dto1.setResultCode("condition");
             dto1.setTaskId(instanceId);
-            AjaxResult ajaxResult1 = Workflow.taskClient.getTask(instanceId);
+            AjaxResult ajaxResult1 = Workflow.taskClient.getTaskNoAuth(instanceId);
             if (!ObjectUtils.isEmpty(ajaxResult1.get("data"))){
                 taskId = ((Map)ajaxResult1.get("data")).get("id").toString();
                 AjaxResult ajaxResult = Workflow.taskClient.completeByTask(taskId, dto1);

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectInitiationServiceImpl.java

@@ -234,12 +234,12 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         AjaxResult ajaxResult = new AjaxResult();
         JSONObject dataObject = new JSONObject();
         try {
-            ajaxResult = Workflow.taskClient.getTask(instanceId);
+            ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
             dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
         }catch (Exception e) {
             //当存在多个用户任务时 主要是安装/设计提交资料修改
             logger.error("当前用户存在多个任务");
-            JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(Workflow.taskClient.getTaskList(instanceId)));
+            JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(Workflow.taskClient.getTasksForDisposal(instanceId)));
             JSONArray jsonArray = jsonObject.getJSONArray("data");
             boolean isEnd = false;
             for(Object o:jsonArray){
@@ -332,7 +332,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
                             || project.getStatus().contains(ProjectInitiationEnum.安装负责人指定项目资料员.getName())
                     ) {
                         unitIds = unitIds.stream().distinct().collect(Collectors.toList());
-                        AjaxResult ajaxResultR = Workflow.taskClient.getTask(instanceId);
+                        AjaxResult ajaxResultR = Workflow.taskClient.getTaskNoAuth(instanceId);
                         dataObject = JSON.parseObject(JSON.toJSONString(ajaxResultR.get("data")));
                         try {
                             taskName=dataObject.getString("name");
@@ -546,12 +546,12 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         JSONObject dataObject = new JSONObject();
         boolean isEnd = false;
         try {
-            AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+            AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
             dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
         }catch (Exception e) {
             //当存在多个用户任务时 主要是安装/设计提交资料修改
             logger.error("当前用户存在多个任务");
-            JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(Workflow.taskClient.getTaskList(instanceId)));
+            JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(Workflow.taskClient.getTasksForDisposal(instanceId)));
             JSONArray jsonArray = jsonObject.getJSONArray("data");
             for(Object o:jsonArray){
                 String name = JSON.parseObject(JSON.toJSONString(o)).getString("name");
@@ -706,7 +706,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         List<Long> unitIds = new ArrayList<>();
         Long extendId = -1L;
         try {
-            AjaxResult ajaxResult = Workflow.taskClient.getTask(overProjectDto.getInstanceId());
+            AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(overProjectDto.getInstanceId());
             JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
             String taskId = dataObject.getString("id");
             LambdaQueryWrapper<ProjectInitiation> wrapper = new LambdaQueryWrapper<>();
@@ -784,7 +784,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
      * @return
      */
     public String getOverProjectFlowTaskName(String instanceId){
-        AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+        AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
         JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
         String taskName = "竣工流程结束！";
         try {
@@ -845,7 +845,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             dto1.setResult(status);
             dto1.setResultCode("condition");
             dto1.setTaskId(instanceId);
-            AjaxResult ajaxResult1 = Workflow.taskClient.getTask(instanceId);
+            AjaxResult ajaxResult1 = Workflow.taskClient.getTaskNoAuth(instanceId);
             if (!ObjectUtils.isEmpty(ajaxResult1.get("data"))) {
                 taskId = ((Map) ajaxResult1.get("data")).get("id").toString();
                 AjaxResult ajaxResult = Workflow.taskClient.completeByTask(taskId, dto1);
@@ -908,7 +908,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         JSONObject dataObject = new JSONObject();
         String auditName = "流程结束！";
         try {
-            AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+            AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
             dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
         } catch (Exception e) {
             e.printStackTrace();

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/TaskServiceImpl.java

@@ -202,7 +202,7 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
 //            AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
 //            JSONObject data = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
 
-            JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(Workflow.taskClient.getTaskList(instanceId)));
+            JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(Workflow.taskClient.getTasksForDisposal(instanceId)));
             JSONArray jsonArray = jsonObject.getJSONArray("data");
             if(jsonArray.size() > 1) {
                 for(Object o:jsonArray){