Merge branch '0.0.1' into debug

controllers/approval.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"encoding/json"
+	"fmt"
 	approval2 "hongze/hongze_mobile_admin/models/request/approval"
 	"hongze/hongze_mobile_admin/models/response/approval"
 	"hongze/hongze_mobile_admin/models/tables/admin"
@@ -116,6 +117,7 @@ func (this *ApprovalCommon) List() {
 			}
 			list[i].DelayPermission = delayPermission
 		}
+		fmt.Println(item.ApproveRoleTypeCode, "===", roleTypeCode)
 		if item.ApproveRoleTypeCode == roleTypeCode {
 			list[i].OpButton = true
 		}

models/tables/company_approval/company_approval.go

@@ -120,7 +120,7 @@ func GetApprovalList(condition string, pars []interface{}, startSize, pageSize i
 	sql := `SELECT a.company_id,b.product_id,a.company_name,a.credit_code,a.address,b.company_type,b.industry_name,
 			b.seller_name,b.create_time,b.freeze_start_date,b.freeze_end_date,b.source,c.create_time AS approval_time,c.approve_time,b.status,
             c.approve_content,c.approve_status,c.apply_method,c.apply_reasons,c.approve_remark,b.start_date,b.end_date,c.company_approval_id,c.company_contract_id,
-            c.apply_real_name
+            c.apply_real_name,c.approve_role_type_code
 			FROM company AS a
 			INNER JOIN company_product AS b ON a.company_id=b.company_id
 			INNER JOIN company_approval AS c ON b.company_id=c.company_id AND b.product_id=c.product_id
@@ -138,7 +138,7 @@ func GetApprovalListByApprovalId(condition string, pars []interface{}, companyAp
 	sql := `SELECT a.company_id,b.product_id,a.company_name,a.credit_code,a.address,b.company_type,b.industry_name,
 			b.seller_name,b.create_time,b.freeze_start_date,b.freeze_end_date,b.source,c.create_time AS approval_time,c.approve_time,b.status,
             c.approve_content,c.approve_status,c.apply_method,c.apply_reasons,c.approve_remark,b.start_date,b.end_date,c.company_approval_id,c.company_contract_id,
-            c.apply_real_name
+            c.apply_real_name,c.approve_role_type_code
 			FROM company AS a
 			INNER JOIN company_product AS b ON a.company_id=b.company_id
 			INNER JOIN company_approval AS c ON b.company_id=c.company_id AND b.product_id=c.product_id