From cc3200dfa186ea001810312ad9d335b3419d0dec Mon Sep 17 00:00:00 2001
From: "Mr. Lan" <fdevops@163.com>
Date: Fri, 9 Oct 2020 00:40:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=B1=95=E7=A4=BA=E5=BC=82=E5=B8=B8bug.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/service/workOrderList.go | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/pkg/service/workOrderList.go b/pkg/service/workOrderList.go
index 7eef6c0..8f33a70 100644
--- a/pkg/service/workOrderList.go
+++ b/pkg/service/workOrderList.go
@@ -99,8 +99,10 @@ func (w *WorkOrder) PureWorkOrderList() (result interface{}, err error) {
 func (w *WorkOrder) WorkOrderList() (result interface{}, err error) {
 
 	var (
-		principals string
-		StateList  []map[string]interface{}
+		principals        string
+		StateList         []map[string]interface{}
+		workOrderInfoList []workOrderInfo
+		minusTotal        int
 	)
 
 	result, err = w.PureWorkOrderList()
@@ -115,9 +117,25 @@ func (w *WorkOrder) WorkOrderList() (result interface{}, err error) {
 			return
 		}
 		var (
-			stateName string
+			stateName    string
+			structResult map[string]interface{}
+			authStatus   bool
 		)
 		if len(StateList) != 0 {
+			structResult, err = ProcessStructure(w.GinObj, v.Process, v.Id)
+			if err != nil {
+				return
+			}
+
+			authStatus, err = JudgeUserAuthority(w.GinObj, v.Id, structResult["workOrder"].(WorkOrderData).CurrentState)
+			if err != nil {
+				return
+			}
+			if !authStatus {
+				minusTotal += 1
+				continue
+			}
+
 			processorList := make([]int, 0)
 			if len(StateList) > 1 {
 				for _, s := range StateList {
@@ -148,7 +166,13 @@ func (w *WorkOrder) WorkOrderList() (result interface{}, err error) {
 		workOrderDetails[i].Principals = principals
 		workOrderDetails[i].StateName = stateName
 		workOrderDetails[i].DataClassify = v.Classify
+		if authStatus {
+			workOrderInfoList = append(workOrderInfoList, workOrderDetails[i])
+		}
 	}
 
+	result.(*pagination.Paginator).Data = &workOrderInfoList
+	result.(*pagination.Paginator).TotalCount -= minusTotal
+
 	return result, nil
 }