统一信用代码关联 （部分）

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

src/dashoo.cn/backend/api/controllers/oilsupplier/select.go

@@ -5,6 +5,7 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/infochange"
 	"dashoo.cn/backend/api/business/oilsupplier/qualchange"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertappend"
+	"dashoo.cn/backend/api/business/register"
 	"encoding/json"
 	// "fmt"
 
@@ -271,12 +272,16 @@ func (this *SelectController) GetProcessAuditList() {
 			asc = true
 		}
 	}
+	svc := supplier.GetOilSupplierService(utils.DBE)
 	tabinx := this.GetString("tabinx")
 	supplierTypeCode := this.GetString("SupplierTypeCode")
 	supplierName := this.GetString("SupplierName")
 	//企业用户必须加创建人条件
+	var registerUser register.OilCorporateInfo
+	sql := " UserName='" + this.User.Username + "'"
+	svc.GetEntity(&registerUser,sql)
 	if this.User.IsCompanyUser == 1 {
-		where = where + " and b.CreateUserId = '" + this.User.Id + "'"
+		where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='"+registerUser.CommercialNo+"')"
 	}
 	if supplierTypeCode != "" {
 		where = where + " and b.SupplierTypeCode like '%" + supplierTypeCode + "%'"
@@ -289,7 +294,7 @@ func (this *SelectController) GetProcessAuditList() {
 	var datainfo DataInfo
 	if tabinx == "0" {
 		var list []supplier.OilSupplierView
-		svc := supplier.GetOilSupplierService(utils.DBE)
+
 		total = svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
 		datainfo.Items = list
 	} else if tabinx == "1" {

src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -502,10 +502,13 @@ func (this *OilSupplierController) GetJoinCertEntityList() {
 	if extOrganizeId == this.User.DepartmentId {
 		where = where + " and a.CreateUserId = '" + this.User.Id + "'"
 	}*/
-
+	svc := supplier.GetOilSupplierService(utils.DBE)
+	var registerUser register.OilCorporateInfo
+	sql := " UserName='" + this.User.Username + "'"
+	svc.GetEntity(&registerUser,sql)
 	//企业用户必须加创建人条件
 	if this.User.IsCompanyUser == 1 {
-		where = where + " and a.CreateUserId = '" + this.User.Id + "'"
+		where = where + " and (a.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='"+registerUser.CommercialNo+"')"
 	} else {
 		//超级管理员和有查看所有数据权限的用户不加条件
 		svcPerm := permission.GetPermissionService(utils.DBE)
@@ -516,7 +519,7 @@ func (this *OilSupplierController) GetJoinCertEntityList() {
 
 	}
 
-	svc := supplier.GetOilSupplierService(utils.DBE)
+
 	var list []supplier.OilSupplierView
 
 	total := svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)