分办--已选部门

src/dashoo.cn/backend/api/business/register/oilcorporateinfo.go

@@ -49,8 +49,9 @@ type OilCorporateInfo struct {
 	CompanyUrl       string    `xorm:"comment('公司网址') VARCHAR(20)"`
 	Remark           string    `xorm:"comment('备注') VARCHAR(500)"`
 	CheckStatus      int       `xorm:"default 0 comment('二级单位审核状态，0：未通过，1：通过') INT(1)"`
-	CheckUserId      string       `xorm:"comment('审核人Id') VARCHAR(50)"`
+	CheckUserId      string    `xorm:"comment('审核人Id') VARCHAR(50)"`
 	CheckUserName    string    `xorm:"comment('审核人姓名') VARCHAR(50)"`
+	CheckUnitId      int       `xorm:"comment('审批二级单位Id') INT(10)"`
 	IsDelete         int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
 	UserName         string    `xorm:"comment('登录账号/用户名') VARCHAR(50)"`
 	UserRealName     string    `xorm:"comment('用户真实姓名') VARCHAR(50)"`

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

@@ -1,8 +1,11 @@
 package casbin
 
 import (
+	"dashoo.cn/backend/api/business/register"
 	"dashoo.cn/business2/parameter"
 	"encoding/json"
+	"strconv"
+
 	//"fmt"
 
 	"dashoo.cn/backend/api/business/oilsupplier/technologyservice"
@@ -448,8 +451,16 @@ func (this *OrganizesController) OrgAllListFen() {
 	svc := organize.GetOrganizeService(utils.DBE)
 	var user userRole.Base_User
 	svc.GetEntityById(this.User.Id, &user)
-	ids := svc.GetAllChildById("0")
-	where := " Id in ( " + ids + " )"
+	var model register.OilCorporateInfo
+	where := "UserId=" + this.User.Id
+	has := svc.GetEntity(&model, where)
+	ids := ""
+	if has {
+		ids = svc.GetAllChildById(strconv.Itoa(model.CheckUnitId))
+	} else {
+		ids = svc.GetAllChildById("0")
+	}
+	where = " Id in ( " + ids + " )"
 
 	list := make([]organize.Base_Organize, 0)
 	svc.GetEntities(&list, where)

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

@@ -6,7 +6,6 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/qualchange"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertappend"
 	"encoding/json"
-
 	// "fmt"
 
 	"dashoo.cn/backend/api/business/oilsupplier/selectbusiness"

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -219,7 +219,7 @@
           let re4 = /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g
           if (!re4.test(this.formData.CommercialNo)) {
             callback(new Error('请填写正确的18位统一社会信用代码'));
-          } else {      
+          } else {
         this.$axios.get('/register/getcommercialno?commercialno='+value, {})
           .then(res => {
                if(res.data.item){
@@ -230,7 +230,7 @@
           })
           .catch(err => {
             console.error(err)
-          })         
+          })
          }
         }
       };
@@ -304,7 +304,7 @@
           })
           .catch(err => {
             console.error(err)
-          })     
+          })
           }
         }
       };
@@ -413,7 +413,8 @@
           LinkStreet: '',
           LinkHouseNo: '',
           LinkZipCode: '',
-          HseTraining: ''
+          HseTraining: '',
+          CheckUnitId: ''
         },
 
         rules: {
@@ -597,7 +598,7 @@
               _this.formData.ContactURL = URL2.join("&")
 
               _this.formData.UserRealName= _this.formData.SupplierName
-
+            _this.formData.CheckUnitId = this.auditorg
               //添加注册信息
               _this.$axios.post('/register/addentity', _this.formData)
                 .then(function (response) {