Sfoglia il codice sorgente

基建类、技术服务类部分准入信息无法存储bug,ptr注册增加不在库中人员角色

Signed-off-by: lijunqing <lijunqing@dashoo.cn>
lijunqing 6 anni fa
parent
commit
f1b3e45969

+ 6 - 0
src/dashoo.cn/backend/api/business/oilrtx/RtxService.go

@@ -11,6 +11,7 @@ import (
 	"dashoo.cn/utils"
 
 	"dashoo.cn/backend/api/business/organize"
+	"dashoo.cn/business2/parameter"
 	"dashoo.cn/business2/userRole"
 	. "dashoo.cn/utils/db"
 	"github.com/go-xorm/xorm"
@@ -218,6 +219,11 @@ func (s *RtxService) HandlePtrLogin(username string, password string, BaseUser s
 			baseuser.Publickey = key
 
 			_, err := s.InsertEntity(&baseuser)
+
+			paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+			roleid := paramSvc.GetBaseparameterMessage("", "paramset", "PuTongRegRoleId")
+
+			utils.RBAC.AddRoleForUserInDomain("uid_"+string(baseuser.Id), "rid_"+roleid, utils.DOMAIN)
 			if err != nil {
 				log.Println(err)
 			}

+ 2 - 2
src/dashoo.cn/frontend_web/src/components/oilsupplier/basisinfo.vue

@@ -525,10 +525,10 @@
         CityAry: [],
         LinkCityAry: [],
         HSEOptions: [{
-          value: 1,
+          value: '1',
           label: '是'
         }, {
-          value: 0,
+          value: '0',
           label: '否'
         }],
 

+ 2 - 2
src/dashoo.cn/frontend_web/src/components/oilsupplier/techinfo.vue

@@ -507,10 +507,10 @@
         CityAry: [],
         LinkCityAry: [],
         HSEOptions: [{
-          value: 1,
+          value: '1',
           label: '是'
         }, {
-          value: 0,
+          value: '0',
           label: '否'
         }],
 

+ 9 - 9
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -482,19 +482,19 @@
           NationalCertTotal: 0,
           DesignerTotal: 0,
           SkillerTotal: 0,
-          Remark: '',
-          IsDelete: '',
-          CreateOn: '',
-          CreateUserId: '',
-          CreateBy: '',
-          ModifiedOn: '',
-          ModifiedUserId: '',
-          ModifiedBy: '',
+          // Remark: '',
+          // IsDelete: '',
+          // CreateOn: '',
+          // CreateUserId: '',
+          // CreateBy: '',
+          // ModifiedOn: '',
+          // ModifiedUserId: '',
+          // ModifiedBy: '',
           CertId: 0,
           SupplierTypeCode: '02',
           SupplierTypeName: '基建类',
           Step: 0,
-          HseTraining: 0,
+          HseTraining: '0',
           AuditIndex: 0
         },
 

+ 9 - 9
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -482,19 +482,19 @@
           NationalCertTotal: 0,
           DesignerTotal: 0,
           SkillerTotal: 0,
-          Remark: '',
-          IsDelete: '',
-          CreateOn: '',
-          CreateUserId: '',
-          CreateBy: '',
-          ModifiedOn: '',
-          ModifiedUserId: '',
-          ModifiedBy: '',
+          // Remark: '',
+          // IsDelete: '',
+          // CreateOn: '',
+          // CreateUserId: '',
+          // CreateBy: '',
+          // ModifiedOn: '',
+          // ModifiedUserId: '',
+          // ModifiedBy: '',
           CertId: 0,
           SupplierTypeCode: '03',
           SupplierTypeName: '技术服务类',
           Step: 0,
-          HseTraining: 0,
+          HseTraining: '0',
           AuditIndex: 0
         },