走完流程的不显示图

guns-admin/src/main/java/com/stylefeng/guns/modular/flowable/service/impl/ExpenseServiceImpl.java

@@ -145,6 +145,12 @@ public class ExpenseServiceImpl extends ServiceImpl<ExpenseMapper, Expense> impl
         Expense expense = this.selectById(expenseId);
         Expense expense = this.selectById(expenseId);
         String processId = expense.getProcessId();
         String processId = expense.getProcessId();
         ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processId).singleResult();
         ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processId).singleResult();
+
+        //流程走完的不显示图
+        if (pi == null) {
+            return;
+        }
+
         Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).singleResult();
         Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).singleResult();
 
 
         //使用流程实例ID，查询正在执行的执行对象表，返回流程实例对象
         //使用流程实例ID，查询正在执行的执行对象表，返回流程实例对象

guns-admin/src/main/webapp/static/modular/flowable/expense/expense.js

@@ -21,8 +21,12 @@ Expense.initColumn = function () {
         {title: '创建时间', field: 'createtime', visible: true, align: 'center', valign: 'middle'},
         {title: '创建时间', field: 'createtime', visible: true, align: 'center', valign: 'middle'},
         {
         {
             title: '操作', visible: true, align: 'center', valign: 'middle', formatter: function (value, row, index) {
             title: '操作', visible: true, align: 'center', valign: 'middle', formatter: function (value, row, index) {
-            return '<button type="button" class="btn btn-primary button-margin" onclick="Expense.findRecord(' + row.id + ')" id=""><i class="fa fa-edit"></i>&nbsp;查看</button>' +
-                '<button type="button" class="btn btn-danger button-margin" onclick="Expense.deleteRecord(' + row.id + ')" id=""><i class="fa fa-arrows-alt"></i>&nbsp;删除</button>';
+            if (row.state == 3) {
+                return '<button type="button" class="btn btn-danger button-margin" onclick="Expense.deleteRecord(' + row.id + ')" id=""><i class="fa fa-arrows-alt"></i>&nbsp;删除</button>';
+            } else {
+                return '<button type="button" class="btn btn-primary button-margin" onclick="Expense.findRecord(' + row.id + ')" id=""><i class="fa fa-edit"></i>&nbsp;查看</button>' +
+                    '<button type="button" class="btn btn-danger button-margin" onclick="Expense.deleteRecord(' + row.id + ')" id=""><i class="fa fa-arrows-alt"></i>&nbsp;删除</button>';
+            }
         }
         }
         }
         }
     ];
     ];