m

youxiw2000
1 parent 9b89bea3
Showing 3 changed files with 39 additions and 40 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/myTaskServiceImpl.java
trash-ui/src/layout/index6.vue → trash-ui/src/layout/index5.vue
trash-ui/src/views/activiti/task/index.vue
@@ -107,9 +107,8 @@ public class myTaskServiceImpl implements myTaskService {
     @Override
     public Page<Task> tasks(Pageable pageable,GetTasksPayload getTasksPayload) {
-        TaskQuery crossQuery = taskService.createTaskQuery();
-        
+        TaskQuery crossQuery = taskService.createTaskQuery();
         TaskQuery crossQuery1 = taskService.createTaskQuery();
         TaskQuery userQuery =  taskService.createTaskQuery();
@@ -118,6 +117,9 @@ public class myTaskServiceImpl implements myTaskService {
         TaskQuery taskQuery = taskService.createTaskQuery();
+
+        List<String> pid = new ArrayList<>();
+        
         List<String> posts = SecurityUtils.getLoginUser().getUser().getPostIds();
         List<String> roles = SecurityUtils.getLoginUser().getUser().getRoleIds();
@@ -126,37 +128,34 @@ public class myTaskServiceImpl implements myTaskService {
         	crossQuery.taskCandidateOrAssigned(SecurityUtils.getUsername());
         	crossQuery1.taskCandidateOrAssigned(SecurityUtils.getUsername());
         }else{
-        	crossQuery.taskCandidateUser(roles.get(0));
-        	crossQuery1.taskCandidateGroupIn(posts);
-        }
-
-        List<org.activiti.engine.task.Task> list1 = crossQuery.list();
-        List<org.activiti.engine.task.Task> list2 = crossQuery1.list();
-        
-        List<String> pid = new ArrayList<>();
-        for(org.activiti.engine.task.Task t2:list2){
-    		if(taskService.getIdentityLinksForTask(t2.getId()).size() == 1){
-            	pid.add(t2.getProcessInstanceId());
-            	continue;
-            }
-    	}
-
-        
-        for(org.activiti.engine.task.Task t1:list1){
-                    	
-        	for(org.activiti.engine.task.Task t2:list2){
-        		        		
-        		if(t1.getId().equals(t2.getId())){
-        			pid.add(t1.getProcessInstanceId());
-        		}
+        	
+        	for(int i = 0;i<roles.size();i++){
+        		
+	            crossQuery = taskService.createTaskQuery();
+	            crossQuery1 = taskService.createTaskQuery();
+	            
+	        	crossQuery.taskCandidateUser(roles.get(i));
+	        	crossQuery1.taskCandidateGroup(posts.get(i));
+	        
+	
+		        List<org.activiti.engine.task.Task> list1 = crossQuery.list();
+		        List<org.activiti.engine.task.Task> list2 = crossQuery1.list();
+
+		        for(org.activiti.engine.task.Task t1:list1){
+		                    	
+		        	for(org.activiti.engine.task.Task t2:list2){
+		        		        		
+		        		if(t1.getId().equals(t2.getId())){
+		        			pid.add(t1.getProcessInstanceId());
+		        		}
+		        	}
+		        }
         	}
         }
-
         for(org.activiti.engine.task.Task tasks : userQuery.list()){
         	pid.add(tasks.getProcessInstanceId());
         }
-
         if(pid.size() > 0){
     		taskQuery.processInstanceIdIn(pid).orderByTaskCreateTime().desc();
 <template>
   <div class="app-container">
-<!--    <el-select v-model="queryParams.dept" filterable  reserve-keyword @change="getList">-->
-<!--      <el-option v-for="item in depts" :label="item.name"-->
-<!--                 :value="item.code" :key="item.code">-->
-<!--      </el-option>-->
-<!--    </el-select>-->
-<!--    <el-select v-model="queryParams.role" filterable  reserve-keyword @change="getList">-->
-<!--      <el-option v-for="item in roles" :label="item.name"-->
-<!--                 :value="item.code" :key="item.code">-->
-<!--      </el-option>-->
-<!--    </el-select>-->
+  <!-- <el-select v-model="queryParams.dept" filterable  reserve-keyword @change="getList">
+     <el-option v-for="item in depts" :label="item.name"
+                :value="item.code" :key="item.code">
+     </el-option>
+   </el-select>
+   <el-select v-model="queryParams.role" filterable  reserve-keyword @change="getList">
+     <el-option v-for="item in roles" :label="item.name"
+                :value="item.code" :key="item.code">
+     </el-option>
+   </el-select> -->
     <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
@@ -17,7 +17,7 @@
     <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
                 @pagination="getList"/>
-    <!-- 审批对话框 -->
+    <!-- 审批对话框
     <el-dialog :title="title" :visible.sync="open" v-if="open" width="500px" append-to-body>
       <div slot="footer" class="dialog-footer">
@@ -175,7 +175,7 @@
       <img src="../../../assets/logo/logo.jpg" width="100%" height="800px"/>
     </el-dialog>
-    <!--  会议管理  -->
+    <!--  会议管理
     <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body :close-on-click-modal="false">
       <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
       <div slot="footer" class="dialog-footer">
@@ -184,7 +184,7 @@
       </div>
     </el-dialog>
-    <!--  请假申请  -->
+    <!--  请假申请
     <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body
                :close-on-click-modal="false">
       <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>