RTX部门同步

src/dashoo.cn/backend/api/business/oilrtx/RtxService.go

@@ -100,17 +100,17 @@ func (s *RtxService) AutoSyncOrgList() bool {
 func (s *RtxService) RecursionOrganize(rtxOrganizes []RtxOrganize) bool {
 	orgSvc := organize.GetOrganizeService(s.DBE)
 	for _, rtxOrg := range rtxOrganizes {
-		var baseOrganize *organize.Base_Organize
-		where := "1=1 and Innerphone='" + rtxOrg.Id + "'"
+		var baseOrganize organize.Base_Organize
+		where := "1=1 and InnerPhone='" + rtxOrg.Id + "'"
 		orgSvc.GetEntity(&baseOrganize, where)
-		if baseOrganize == nil {
+		/*if baseOrganize == nil {
 			baseOrganize = new(organize.Base_Organize)
-		}
+		}*/
 
 		parentId := 0
 		if len(rtxOrg.ParentId) > 0 {
 			var baseParentOrganize organize.Base_Organize
-			where := "1=1 and Innerphone='" + rtxOrg.ParentId + "'"
+			where := "1=1 and InnerPhone='" + rtxOrg.ParentId + "'"
 			orgSvc.GetEntity(&baseParentOrganize, where)
 			parentId = baseParentOrganize.Id
 		}
@@ -141,7 +141,7 @@ func (s *RtxService) RecursionOrganize(rtxOrganizes []RtxOrganize) bool {
 			baseOrganize.Modifieduserid = 284
 			orgSvc.UpdateEntityById(baseOrganize.Id, baseOrganize)
 		}
-		if rtxOrg.Children != nil || len(rtxOrg.Children) > 0 {
+		if rtxOrg.Children != nil && len(rtxOrg.Children) > 0 {
 			s.RecursionOrganize(rtxOrg.Children)
 		}
 	}
@@ -196,7 +196,7 @@ func (s *RtxService) HandlePtrLogin(username string, password string) *http.Resp
 	var rtxRespToken RtxRespToken
 	json.Unmarshal(jsonBlob, &rtxRespToken)
 
-	if rtxRespToken.Code == "2000" {
+	if rtxRespToken.Code == 2000 {
 		log.Println("hahaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
 		//在这里生成好的token
 	} else {

src/dashoo.cn/backend/api/business/oilrtx/rtx.go

@@ -25,7 +25,7 @@ type RtxLogin struct {
 }
 
 type RtxRespToken struct {
-	Code    string `json:"code"`
+	Code    int    `json:"code"`
 	Message string `json:"message"`
 	Token   string `json:"token"`
 }

src/dashoo.cn/backend/api/controllers/rtx/rtx.go

@@ -33,7 +33,6 @@ func (this *RtxController) GetRtx() {
 func (this *RtxController) SyncOrganizeList() {
 	rtxSvc := oilrtx.GetRtxService(utils.DBE)
 	resp := rtxSvc.AutoSyncOrgList()
-
 	var datainfo DataInfo
 	datainfo.Items = resp
 	this.Data["json"] = &datainfo

src/dashoo.cn/frontend_web/src/pages/system/organize.vue

@@ -11,7 +11,7 @@
         </el-breadcrumb>
         <span style="float: right;">
           <el-button size="mini" type="primary" style="margin-left:10px; margin-top: -4px;" @click="opendatadialog(1,null,-1);resetForm('organizeform')">新增组织</el-button>
-          <el-button size="mini" type="primary" style="margin-right:5px; margin-top: -4px;" @click="syncOrganize">同步RTX部门</el-button>
+          <el-button size="mini" type="primary" style="margin-right:5px; margin-top: -4px;" @click="syncOrganize" :loading="syncOrgLoading">同步RTX部门</el-button>
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="组织名称">
@@ -113,6 +113,7 @@
 
     data() {
       return {
+        syncOrgLoading: false,
         downloading: true,
         selectedNode: 0,
         currentItemCount: 0,
@@ -289,9 +290,12 @@
         this.initData()
       },
       syncOrganize () {
+        let _this = this
+        _this.syncOrgLoading = true
         rtxApi.syncOrganize(this.$axios).then(res => {
+          _this.syncOrgLoading = false
           //response
-          if (res.data.Items) {
+          if (res.data.items) {
             this.$message({
               type: 'success',
               message: '同步成功！'
@@ -302,8 +306,6 @@
               message: '同步失败！'
             })
           }
-          return res.data.Items
-
         }).catch(err => {
           // handle error
           console.error(err)