权限

src/dashoo.cn/backend/api/business/paymentinfo/paymentinfo.go

@@ -6,6 +6,9 @@ type OilPaymentInfo struct {
 	Id             int       `xorm:"not null pk autoincr INT(11)"`
 	SupplierId     int       `xorm:"comment('Supplier表') INT(11)"`
 	SupplierCertId int       `xorm:"comment('SupplierCert表') INT(11)"`
+	USCCode        string    `xorm:"comment('统一社会信用代码') VARCHAR(40)"`
+	SupplierName   string    `xorm:"comment('企业名称') VARCHAR(100)"`
+	ProjectName    string    `xorm:"comment('项目名称') VARCHAR(100)"`
 	Amount         string    `xorm:"comment('缴费金额') DECIMAL(10,2)"`
 	IsPay          string    `xorm:"comment('是否缴费 1 是 2否') VARCHAR(5)"`
 	PayMode        string    `xorm:"comment('缴费方式') VARCHAR(10)"`
@@ -23,7 +26,7 @@ type OilPaymentInfo struct {
 }
 
 type PaymentinfoList struct {
-	OilPaymentInfo      `xorm:"extends"`
+	OilPaymentInfo   `xorm:"extends"`
 	SupplierTypeCode string
 	SupplierTypeName string
 	SupplierName     string

src/dashoo.cn/backend/api/controllers/casbin/organize.go

@@ -41,7 +41,7 @@ func (this *OrganizesController) List() {
 	svc := organize.GetOrganizeService(utils.DBE)
 
 	svcPerm := permission.GetPermissionService(utils.DBE)
-	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_system.allorganize")
+	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_system.organize.AllRecord")
 	topid := ""
 	if isauth {
 		paramSvc := baseparameter.GetBaseparameterService(utils.DBE)

src/dashoo.cn/backend/api/controllers/casbin/user.go

@@ -150,7 +150,7 @@ func (this *UserController) List() {
 	var users []userRole.Base_User
 
 	svcPerm := permission.GetPermissionService(utils.DBE)
-	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_system.alluser")
+	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_system.user.AllRecord")
 	topid := ""
 	if isauth {
 		paramSvc := baseparameter.GetBaseparameterService(utils.DBE)

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

@@ -106,7 +106,7 @@ func (this *AnnualAuditController) GetEntityList() {
 	} else {
 		//超级管理员和有查看所有数据权限的用户不加条件
 		svcPerm := permission.GetPermissionService(utils.DBE)
-		isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
+		isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.annual.AllRecord")
 		if !svcPerm.IsAdmin(this.User.Id) && !isauth {
 			where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='"+registerUser.CommercialNo+"')"
 		}
@@ -918,6 +918,8 @@ func (this *AnnualAuditController) AnnualAudit() {
 			var payinfo paymentinfo.OilPaymentInfo
 			payinfo.SupplierId = list.SupplierId
 			payinfo.SupplierCertId = list.CerId
+			payinfo.USCCode = supplierEntity.CommercialNo
+			payinfo.SupplierName = supplierEntity.SupplierName
 			payinfo.PayType = "2"
 			payinfo.IsPay = "1"
 			payinfo.Amount = strconv.FormatFloat(Amount,'E',-1,64)

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

@@ -395,7 +395,7 @@ func (this *InfoChangeController) GetSuppList() {
 	} else {
 		//超级管理员和有查看所有数据权限的用户不加条件
 		svcPerm := permission.GetPermissionService(utils.DBE)
-		isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
+		isauth := svcPerm.IsAuthorized(this.User.Id, "oil_system.infochange.AllRecord")
 		if !svcPerm.IsAdmin(this.User.Id) && !isauth {
 			where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='" + registerUser.CommercialNo + "')"
 		}

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

@@ -987,6 +987,8 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 					var payinfo paymentinfo.OilPaymentInfo
 					payinfo.SupplierId = supplierCertEntity.SupplierId
 					payinfo.SupplierCertId = supplierCertEntity.Id
+					payinfo.USCCode = supplierEntity.CommercialNo
+					payinfo.SupplierName = supplierEntity.SupplierName
 					payinfo.PayType = "1"
 					payinfo.Amount = strconv.FormatFloat(Amount,'E',-1,64)
 					payinfo.IsPay = "1"

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

@@ -115,7 +115,7 @@ func (this *OilSupplierCertAppendController) GetList() {
 	} else {
 		//超级管理员和有查看所有数据权限的用户不加条件
 		svcPerm := permission.GetPermissionService(utils.DBE)
-		isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
+		isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.append.AllRecord")
 		if !svcPerm.IsAdmin(this.User.Id) && !isauth {
 			where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='"+registerUser.CommercialNo+"')"
 		}
@@ -803,6 +803,8 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 					var payinfo paymentinfo.OilPaymentInfo
 					payinfo.SupplierId = supplierCertAppendEntity.SupplierId
 					payinfo.SupplierCertId = supplierCertAppendEntity.SupplierCertId
+					payinfo.USCCode = supplierEntity.CommercialNo
+					payinfo.SupplierName = supplierEntity.SupplierName
 					payinfo.PayType = "3"
 					payinfo.IsPay = "1"
 					payinfo.Amount = strconv.FormatFloat(Amount,'E',-1,64)