Merge branch 'cygx_8.2' of http://8.136.199.33:3000/hongze/hongze_mobile_admin into debug

models/tables/company_approval/company_approval.go

@@ -762,6 +762,9 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, compa
 				if contractPermissionEndDateTime.After(nowPermissionEndDateTime) {
 					needUpdate = true
 				}
+				if nowPermission.IsUpgrade != pv.IsUpgrade {
+					needUpdate = true
+				}
 			}
 
 			//如果 需要更新 字段 为 true，那么就去更新
@@ -770,9 +773,9 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, compa
 				nowPermission.LastUpdatedTime = time.Now()
 				nowPermission.ModifyTime = time.Now()
 				nowPermission.CompanyContractId = pv.CompanyContractId
-				nowPermission.IsUpgrade = pv.IsUpgrade
 				nowPermission.Status = "正式"
-				_, err = tx.Update(nowPermission, "EndDate", "LastUpdatedTime", "ModifyTime", "CompanyContractId", "Status")
+				nowPermission.IsUpgrade = pv.IsUpgrade
+				_, err = tx.Update(nowPermission, "EndDate", "LastUpdatedTime", "ModifyTime", "CompanyContractId", "Status","IsUpgrade")
 				if err != nil {
 					return
 				}