增加自审批节点，修改待办查询bug，修改角色查询bug

server/resource/template/web/workflowForm.vue.tpl

@@ -31,6 +31,7 @@
            <el-button v-if="this.wf.clazz == 'start'" @click="start" type="primary">启动</el-button>
            <!-- complete传入流转参数 决定下一步会流转到什么位置 此处可以设置多个按钮来做不同的流转 -->
            <el-button v-if="canShow" @click="complete('yes')" type="primary">提交</el-button>
+           <el-button v-if="showSelfNode" @click="complete('')" type="primary">确认</el-button>
            <el-button @click="back" type="primary">返回</el-button>
            </el-form-item>
     </el-form>
@@ -56,8 +57,12 @@ export default {
         type:Object,
         default:function(){return{}}
       },
+      move:{
+         type:Object,
+         default:function(){return{}}
+      },
       workflowMoveID:{
-        type:Number,
+        type:[Number,String],
         default:0
       }
    },
@@ -91,6 +96,13 @@ export default {
     };
   },
   computed:{
+      showSelfNode(){
+         if(this.wf.assignType == "self" && this.move.promoterID == this.userInfo.ID){
+             return true
+         }else{
+             return false
+         }
+      },
       canShow(){
          if(this.wf.assignType == "user"){
             if(this.wf.assignValue.indexOf(","+this.userInfo.ID+",")>-1 && this.wf.clazz == 'userTask'){
@@ -105,7 +117,6 @@ export default {
                return false
             }
          }
-         return false
       },
       ...mapGetters("user", ["userInfo"])
   },

server/service/sys_workflow.go

@@ -406,7 +406,7 @@ func GetMyStated(userID uint) (err error, wfms []model.WorkflowMove) {
 func GetMyNeed(userID uint, AuthorityID string) (err error, wfms []model.WorkflowMove) {
 	user := "%," + strconv.Itoa(int(userID)) + ",%"
 	auth := "%," + AuthorityID + ",%"
-	err = global.GVA_DB.Preload("Promoter").Preload("Operator").Preload("WorkflowNode").Preload("WorkflowProcess").Joins("INNER JOIN workflow_nodes as node ON workflow_moves.workflow_node_id = node.id").Where("is_active = ? AND (node.assign_type = ? AND node.assign_value LIKE ? ) OR (node.assign_type = ? AND node.assign_value LIKE ? )", true, "user", user, "authority", auth).Find(&wfms).Error
+	err = global.GVA_DB.Preload("Promoter").Preload("Operator").Preload("WorkflowNode").Preload("WorkflowProcess").Joins("INNER JOIN workflow_nodes as node ON workflow_moves.workflow_node_id = node.id").Where("is_active = ? AND ((node.assign_type = ? AND node.assign_value LIKE ? ) OR (node.assign_type = ? AND node.assign_value LIKE ? ) OR (node.assign_type = ? AND promoter_id = ? ))", true, "user", user, "authority", auth, "self", userID).Find(&wfms).Error
 	return err, wfms
 }