youxiw2000 / trash · Commits

Commit 038c66f8ad6c42f104c5ac65c8d2f84fa3b185d2

Authored by youxiw2000
1 parent a79ad7c9
build: skipped

m

Inline Side-by-side
Showing 4 changed files with 31 additions and 31 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
  View file @038c66f
@@ -84,20 +84,20 @@ public class ActTaskServiceImpl implements IActTaskService { @@ -84,20 +84,20 @@ public class ActTaskServiceImpl implements IActTaskService {
84 public Page<ActTaskDTO> selectProcessDefinitionList(PageDomain pageDomain) { 84 public Page<ActTaskDTO> selectProcessDefinitionList(PageDomain pageDomain) {
85 Page<ActTaskDTO> list = new Page<ActTaskDTO>(); 85 Page<ActTaskDTO> list = new Page<ActTaskDTO>();
86 86
87 - // if (ServletUtils.getParameter("role") != null) {  
88 - // List<String> posts = new ArrayList<>();  
89 - // posts.add(ServletUtils.getParameter("role"));  
90 - // SecurityUtils.getLoginUser().getUser().setPostIds(posts);  
91 - // }  
92 - // if (ServletUtils.getParameter("dept") != null) {  
93 - // List<String> roles = new ArrayList<>();  
94 - // roles.add(ServletUtils.getParameter("dept"));  
95 - // SecurityUtils.getLoginUser().getUser().setRoleIds(roles);  
96 - // }  
97 - // if (SecurityUtils.getLoginUser().getUser().getPostIds().size() == 0  
98 - // || SecurityUtils.getLoginUser().getUser().getRoleIds().size() == 0) {  
99 - // return list;  
100 - // } 87 + if (ServletUtils.getParameter("role") != null) {
  88 + List<String> posts = new ArrayList<>();
  89 + posts.add(ServletUtils.getParameter("role"));
  90 + SecurityUtils.getLoginUser().getUser().setPostIds(posts);
  91 + }
  92 + if (ServletUtils.getParameter("dept") != null) {
  93 + List<String> roles = new ArrayList<>();
  94 + roles.add(ServletUtils.getParameter("dept"));
  95 + SecurityUtils.getLoginUser().getUser().setRoleIds(roles);
  96 + }
  97 + if (SecurityUtils.getLoginUser().getUser().getPostIds().size() == 0
  98 + || SecurityUtils.getLoginUser().getUser().getRoleIds().size() == 0) {
  99 + return list;
  100 + }
101 101
102 org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime 102 org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime
103 .tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize())); 103 .tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize()));
trash-ui/src/layout/index.vue
  View file @038c66f
1 <template> 1 <template>
  2 + <div :class="classObj" class="app-wrapper">
  3 + <sidebar class="sidebar-container" />
  4 + <div :class="{hasTagsView:needTagsView}" class="main-container">
  5 + <tags-view v-if="needTagsView" />
2 <app-main /> 6 <app-main />
  7 +
  8 + </div>
  9 + </div>
3 </template> 10 </template>
4 11
5 <script> 12 <script>
trash-ui/src/layout/index66.vue renamed to trash-ui/src/layout/index5.vue
  View file @038c66f
1 <template> 1 <template>
2 - <div :class="classObj" class="app-wrapper">  
3 - <sidebar class="sidebar-container" />  
4 - <div :class="{hasTagsView:needTagsView}" class="main-container">  
5 - <tags-view v-if="needTagsView" />  
6 <app-main /> 2 <app-main />
7 -  
8 - </div>  
9 - </div>  
10 </template> 3 </template>
11 4
12 <script> 5 <script>
trash-ui/src/views/activiti/task/index.vue
  View file @038c66f
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 -<!-- <el-select v-model="queryParams.dept" filterable reserve-keyword @change="getList">-->  
4 -<!-- <el-option v-for="item in depts" :label="item.name"-->  
5 -<!-- :value="item.code" :key="item.code">-->  
6 -<!-- </el-option>-->  
7 -<!-- </el-select>-->  
8 -<!-- <el-select v-model="queryParams.role" filterable reserve-keyword @change="getList">-->  
9 -<!-- <el-option v-for="item in roles" :label="item.name"-->  
10 -<!-- :value="item.code" :key="item.code">-->  
11 -<!-- </el-option>-->  
12 -<!-- </el-select>--> 3 + <el-select v-model="queryParams.dept" filterable reserve-keyword @change="getList">
  4 + <el-option v-for="item in depts" :label="item.name"
  5 + :value="item.code" :key="item.code">
  6 + </el-option>
  7 + </el-select>
  8 + <el-select v-model="queryParams.role" filterable reserve-keyword @change="getList">
  9 + <el-option v-for="item in roles" :label="item.name"
  10 + :value="item.code" :key="item.code">
  11 + </el-option>
  12 + </el-select>
13 13
14 14
15 <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/> 15 <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>