浏览代码

fix 合同审批,处理中逻辑调整

Roc 3 年之前
父节点
当前提交
02c771b0a7

+ 1 - 1
controllers/base_common.go

@@ -13,7 +13,7 @@ var apiLog *log.Log
 
 func init() {
 	if utils.RunMode == "release" {
-		logDir := `/data/rdlucklog/hongze_api`
+		logDir := `/data/rdlucklog/hongze_mobile_admin`
 		apiLog = log.Init("20060102.api", logDir)
 	} else {
 		apiLog = log.Init("20060102.api")

+ 1 - 1
controllers/seal_approval.go

@@ -232,7 +232,7 @@ func (c *SealApprovalCommon) List() {
 			return
 		}
 		selfContractApprovalRecordMap := make(map[int]*contract_approval_record.ContractApprovalRecord)
-		for i := 0; i < len(selfContractApprovalRecordList)-1; i++ {
+		for i := 0; i < len(selfContractApprovalRecordList); i++ {
 			selfContractApprovalRecordMap[selfContractApprovalRecordList[i].ContractApprovalId] = selfContractApprovalRecordList[i]
 		}
 

+ 2 - 2
models/tables/contract_approval_record/contract_approval_record.go

@@ -135,10 +135,10 @@ func GetSelfContractApprovalRecordList(contractApprovalIds string, approveUserId
 SELECT
 a.* from contract_approval_record a
 	join contract_approval b on a.contract_approval_id = b.contract_approval_id 
-WHERE a.contract_approval_id in (` + contractApprovalIds + `) AND (approve_user_id = ? or approve_user_id=0) 
+WHERE a.contract_approval_id in (` + contractApprovalIds + `) AND (approve_user_id = ? or approve_user_id=?) 
 and a.node_id<=b.curr_node_id`
 	sql += ` order by contract_approval_record_id desc  `
-	_, err = o.Raw(sql, approveUserId).QueryRows(&list)
+	_, err = o.Raw(sql, approveUserId, approveUserId).QueryRows(&list)
 	return
 }