From ef6499ac58f7b0ea357295912da3f753d2af1773 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 10:02:37 +0800
Subject: [PATCH] 更改头部

---
 admin/src/components/business/OperaDeviceDataListWindow.vue                                          |   72 +++
 server/system_service/src/main/java/com/doumee/core/utils/Constants.java                             |    3 
 server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml                                     |    3 
 admin/src/views/business/deviceDuanluqi.vue                                                          |    3 
 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/JiandaoyunCloudController.java     |    9 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java  |  186 +++-----
 server/jiandaoyun_service/src/main/java/com/doumee/core/jiandaoyun/model/request/MemberPushData.java |    1 
 server/system_service/src/main/java/com/doumee/dao/business/model/Member.java                        |    2 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java  |   10 
 server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java                              |   49 --
 server/jiandaoyun_service/src/main/java/com/doumee/core/jiandaoyun/model/http/ApiClient.java         |    8 
 server/jiandaoyun_service/src/main/java/com/doumee/core/jiandaoyun/constants/HttpConstant.java       |    5 
 server/visits/dmvisit_service/pom.xml                                                                |    5 
 server/system_service/src/main/java/com/doumee/config/DataSyncConfig.java                            |    5 
 admin/src/views/business/internalCompany.vue                                                         |   21 
 server/pom.xml                                                                                       |    2 
 admin/src/components/business/OperaDeviceDuanluqiWindow.vue                                          |    4 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java |  819 +-------------------------------------
 18 files changed, 227 insertions(+), 980 deletions(-)

diff --git a/admin/src/components/business/OperaDeviceDataListWindow.vue b/admin/src/components/business/OperaDeviceDataListWindow.vue
index 69c4a7d..b23d1b4 100644
--- a/admin/src/components/business/OperaDeviceDataListWindow.vue
+++ b/admin/src/components/business/OperaDeviceDataListWindow.vue
@@ -1,7 +1,7 @@
 <template>
   <GlobalWindow
       :title="title"
-      width="85%"
+      width="100%"
       :visible.sync="visible"
   >
     <TableLayout >
@@ -19,20 +19,30 @@
           <div style="display: flex;margin-top: 20px;">
             <div style="flex: 1"><span  class="label">MQTT IP锛�</span>{{model.doorNameObj.mqttIp ||''}}</div>
             <div style="flex: 1"><span  class="label">MQTT绔彛锛�</span>{{model.doorNameObj.mqttPort||''}}</div>
-            <div style="flex: 3"> <span class="label">鏈�杩戞帶鍒舵搷浣滐細</span>{{model.remark||''}}</div>
+            <div style="flex: 3">
+              <span class="label">鏈�杩戞帶鍒舵搷浣滐細</span>
+              <span class="orange" >{{model.remark||''}}</span>
+            </div>
           </div>
         </div>
-        <el-form-item label="寮�鍏冲簭鍙�" prop="val1">
+        <div class="platgroup_tabs">
+          <div class="tab" :class="{ active: activeGroup === item.id }" @click="groupClick(item)"
+               v-for="(item, i) in groupList" :key="i">
+            {{ item.name }}
+          </div>
+        </div>
+        <el-form-item label="寮�鍏冲簭鍙�" v-if="activeGroup==0" prop="val1">
           <el-input v-model="searchForm.val1" placeholder="璇疯緭鍏ュ紑鍏冲簭鍙�" @keypress.enter.native="search"></el-input>
         </el-form-item>
-        <section>
+        <section v-if="activeGroup==0">
           <el-button type="primary" @click="search">鎼滅储</el-button>
           <el-button @click="reset">閲嶇疆</el-button>
         </section>
       </el-form>
       <!-- 琛ㄦ牸鍜屽垎椤� -->
-      <template v-slot:table-wrap>
+      <template  v-slot:table-wrap>
         <el-table
+            v-if="activeGroup===0"
             :height="tableHeightNew"
             v-loading="isWorking.search"
             :data="tableData.list"
@@ -50,6 +60,24 @@
           <el-table-column prop="val3" label="鐢靛湩(V)" min-width="120px"></el-table-column>
           <el-table-column prop="val4" label="娓╁害(鈩�)" min-width="180px" ></el-table-column>
           <el-table-column prop="val5" label="鏈夊姛鍔熺巼鍊硷紙kW锛�" min-width="120px"></el-table-column>
+        </el-table>
+        <el-table
+            v-if="activeGroup===1"
+            :height="tableHeightNew"
+            v-loading="isWorking.search"
+            :data="tableData.list"
+            stripe>
+          <el-table-column prop="createDate" label="鎿嶄綔鏃堕棿" min-width="150px"></el-table-column>
+          <el-table-column prop="val4" label="鎿嶄綔浜�" min-width="100px" ></el-table-column>
+          <el-table-column prop="val3" label="鎿嶄綔鍐呭" min-width="100px">
+            <template slot-scope="{row}">
+                <span v-if=" row.val3 === '銆愬悎闂搞��'" class="green">{{row.val3||''}}</span>
+                <span  v-else-if=" row.val3 === '銆愬垎闂搞��'" class="red">{{row.val3||''}}</span>
+                <span v-else>{{row.val3||''}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="val5" label="寮�鍏冲簭鍙�" min-width="120px"></el-table-column>
+          <el-table-column prop="val2" label="鍐呭" min-width="300px" show-overflow-tooltip></el-table-column>
         </el-table>
         <pagination
             @size-change="handleSizeChange"
@@ -79,10 +107,13 @@
       // 琛ㄥ崟鏁版嵁
       visible: false,
       title: '',
+      activeGroup:0,
       model:{},
+      groupList: [{ id: 0, name: '鏁版嵁涓婃姤璁板綍', type: 0 }, { id: 1, name: '杩滅▼鎺у埗璁板綍', type: 1 }],
       searchForm: {
         deviceId:  null,
-        val1:''
+        val1: '',
+        dataType:0
       }
     }
   },
@@ -96,6 +127,12 @@
     this.search()
   },
   methods: {
+    groupClick (item) {
+      this.activeGroup = item.id
+      this.searchForm.val1 = ''
+      this.searchForm.dataType = item.type
+      this.search()
+    },
     open (title, row) {
       this.title = title +' 銆�'+ (row.name)+'銆�'
       this.searchForm.deviceId = row.id
@@ -118,12 +155,33 @@
           total: 0
         }
       }
-      this.search()
+      this.groupClick(this.groupList[0])
     }
   }
 }
 </script>
 <style>
+.platgroup_tabs {
+  flex: 1;
+  display: flex;
+  border-bottom: 1px solid #dfe2e8;
+  margin-bottom:30px;
+
+  .tab {
+    color: #666666;
+    margin-right: 40px;
+    cursor: pointer;
+    padding-bottom: 18px;
+    border-bottom: 2px solid #fff;
+  }
+
+  .active {
+    font-weight: 500;
+    font-size: 15px;
+    color: #2080f7;
+    border-bottom: 2px solid $primary-color;
+  }
+}
 .label{
 /*  width: 80px;
   text-align: right;*/
diff --git a/admin/src/components/business/OperaDeviceDuanluqiWindow.vue b/admin/src/components/business/OperaDeviceDuanluqiWindow.vue
index 99021aa..d1ec282 100644
--- a/admin/src/components/business/OperaDeviceDuanluqiWindow.vue
+++ b/admin/src/components/business/OperaDeviceDuanluqiWindow.vue
@@ -34,7 +34,7 @@
             1.鍏ㄩ儴寮�鍏冲簭鍙凤細鍙傝�冭澶囧疄闄呴厤缃紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑锛屽 1,2,3;<br>
             2.鎺у埗寮�鍏冲簭鍙凤細绯荤粺鏍规嵁閰嶇疆瑙勫垯锛屽垽鏂紑鍏冲綋鍓嶇┖闂蹭腑杩涜銆愯嚜鍔ㄥ垎闂搞��,澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑锛屽 1,2;<br>
             3.鑷姩鍒嗛椄瑙勫垯锛氶拡瀵规帶鍒跺紑鍏冲簭鍙风殑閰嶇疆锛屽畾鏃舵娴嬨�愮┖闂叉椂闀裤�戝唴婊¤冻寮�鍏崇數娴佸�奸兘鍦ㄣ�愮┖闂茬數娴侀槇鍊笺�戣寖鍥村唴锛屽垯杩涜鑷姩鍒嗛椄鎺у埗;<br>
-            4.绌洪棽鏃堕暱: 璇疯缃嚦灏戠┖闂叉椂闀垮ぇ浜庣瓑浜�300绉掞紙5鍒嗛挓锛夈��
+            4.绌洪棽鏃堕暱: 璇疯缃嚦灏戠┖闂叉椂闀垮ぇ浜庣瓑浜�300绉掞紙5鍒嗛挓锛夈��<br>
             5.濡傞渶杩滅▼鎺у埗寮�鍏筹紝璇锋纭～鍐欎笅杩板叏閮ㄥ弬鏁颁俊鎭��
           </p>
           <div style="display: flex">
@@ -118,7 +118,7 @@
         name: [
           { required: true, message: '璇疯緭鍏ヨ澶囧悕绉�' }
         ],
-      /*  max: [
+        /*max: [
           { required: true, message: '璇疯緭鍏ヨ澶囩┖闂茬數娴侀槇鍊�' }
         ],*/
         doorId: [
diff --git a/admin/src/views/business/deviceDuanluqi.vue b/admin/src/views/business/deviceDuanluqi.vue
index 368c0e3..f7851fd 100644
--- a/admin/src/views/business/deviceDuanluqi.vue
+++ b/admin/src/views/business/deviceDuanluqi.vue
@@ -133,10 +133,9 @@
     return {
       // 鎼滅储
       searchForm: {
-        doorName: '',
         doorNo: '',
         no: '',
-        regionPathName: '',
+        name: '',
         type: 5
       },
       isWorkSending: false,
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index 4f15279..763b87f 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -32,7 +32,7 @@
         :tree-props="{ children: 'childList', hasChildren: 'hasChildren' }" row-key="id"
         @selection-change="handleSelectionChange" default-expand-all>
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="name" label="缁勭粐鍚嶇О" min-width="200px" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="name" label="缁勭粐鍚嶇О" min-width="200px"></el-table-column>
         <el-table-column prop="name" label="缁勭粐绫诲瀷" min-width="80px">
           <template scope="{row}">
             <span v-if="row.type == 0">鐩稿叧鏂圭粍缁�</span>
@@ -48,7 +48,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="sortnum" align="center" label="鎺掑簭鐮�" min-width="80px"></el-table-column>
-        <el-table-column prop="companyNamePath" label="缁勭粐璺緞" min-width="200px"  show-overflow-tooltip></el-table-column>
+        <el-table-column prop="companyNamePath" label="缁勭粐璺緞" min-width="200px"></el-table-column>
         <el-table-column prop="editorName" label="鎿嶄綔浜�" width="100px"></el-table-column>
         <el-table-column prop="editDate" label="鏈�鍚庢洿鏂版椂闂�" min-width="150px"></el-table-column>
         <el-table-column label="鎿嶄綔" width="230" fixed="right">
@@ -92,7 +92,7 @@
       total: 0
     }
   },
-  provide () {
+  provide() {
     return {
       sysConfig: () => this.sysConfig
     }
@@ -133,20 +133,7 @@
     },
     // 鍚屾淇℃伅
     async synchronous () {
-      var msg = '璇ユ搷浣滃皢绯荤粺娓呯┖宸叉湁缁勭粐淇℃伅'
-      this.sysConfig = this.sysConfig || {}
-      if (this.sysConfig.orgUserDataOrigin === 0) {
-        msg = '鏈郴缁熷綋鍓嶇粍缁囩敱绯荤粺鑷缓妯″紡锛岃鍔熻兘灏嗗垵濮嬪寲鍚屾娴峰悍瀹夐槻骞冲彴缁勭粐淇℃伅锛岃鎿嶄綔缁撴灉鍙兘浼氭竻绌烘垨鍒犻櫎绯荤粺宸叉湁缁勭粐鏁版嵁锛�'
-      }else if (this.sysConfig.orgUserDataOrigin === 1) {
-        msg = '鏈郴缁熷綋鍓嶇粍缁囨潵婧愪簬涓夋柟ERP骞冲彴锛岃璇ユ搷浣滅粨鏋滃彲鑳戒細娓呯┖鎴栧垹闄ょ郴缁熷凡鏈夌粍缁囨暟鎹紝'
-      }else if (this.sysConfig.orgUserDataOrigin === 2) {
-        msg = '鏈郴缁熷綋鍓嶇粍缁囨潵婧愪簬娴峰悍瀹夐槻骞冲彴骞冲彴锛岃璇ユ搷浣滅粨鏋滃彲鑳戒細娓呯┖鎴栧垹闄ょ郴缁熷凡鏈夌粍缁囨暟鎹紝'
-      }else if (this.sysConfig.orgUserDataOrigin === 3) {
-        msg = '鏈郴缁熷綋鍓嶇粍缁囨潵婧愪簬绠�閬撲簯骞冲彴锛岃璇ユ搷浣滅粨鏋滃彲鑳戒細娓呯┖鎴栧垹闄ょ郴缁熷凡鏈夌粍缁囨暟鎹紝'
-      }else if (this.sysConfig.orgUserDataOrigin === 4) {
-        msg = '鏈郴缁熷綋鍓嶇粍缁囨潵婧愪簬閽夐拤骞冲彴锛岃璇ユ搷浣滅粨鏋滃彲鑳戒細娓呯┖鎴栧垹闄ょ郴缁熷凡鏈夌粍缁囨暟鎹紝'
-      }
-      this.$dialog.actionConfirm(msg + ',鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�', '鎿嶄綔纭鎻愰啋')
+      this.$dialog.actionConfirm('璇ユ搷浣滃皢绯荤粺娓呯┖宸叉湁缁勭粐淇℃伅锛屾偍纭鍚屾鍏ㄩ儴淇℃伅鍚楋紵', '鎿嶄綔纭鎻愰啋')
         .then(() => {
           this.loading = true
           companySync({})
diff --git a/server/jiandaoyun_service/src/main/java/com/doumee/core/jiandaoyun/constants/HttpConstant.java b/server/jiandaoyun_service/src/main/java/com/doumee/core/jiandaoyun/constants/HttpConstant.java
index cccd383..9439704 100644
--- a/server/jiandaoyun_service/src/main/java/com/doumee/core/jiandaoyun/constants/HttpConstant.java
+++ b/server/jiandaoyun_service/src/main/java/com/doumee/core/jiandaoyun/constants/HttpConstant.java
@@ -4,8 +4,7 @@
  * http 鐩稿叧鐨勫父閲�
  */
 public class HttpConstant {
-//    public static final String HOST = "https://api.jiandaoyun.com/api/";
-//    public static final String HOST = "https://lcdp.ahyc.com.cn:30443/api/";
+    public static final String HOST = "https://api.jiandaoyun.com/api/";
 
     /**
      * 閮ㄩ棬鐩稿叧鐨勬帴鍙ｅ墠缂�
@@ -51,7 +50,7 @@
     /**
      * API_KEY
      */
-//    public static final String API_KEY = "JsmYomhn3dissp9ZJ6QeTpnH2xKoKZgw";
+    public static final String API_KEY = "JsmYomhn3dissp9ZJ6QeTpnH2xKoKZgw";
 
     public static final String APP_ID = "APP_ID";
 
diff --git a/server/jiandaoyun_service/src/main/java/com/doumee/core/jiandaoyun/model/http/ApiClient.java b/server/jiandaoyun_service/src/main/java/com/doumee/core/jiandaoyun/model/http/ApiClient.java
index 679cc20..38e01d1 100644
--- a/server/jiandaoyun_service/src/main/java/com/doumee/core/jiandaoyun/model/http/ApiClient.java
+++ b/server/jiandaoyun_service/src/main/java/com/doumee/core/jiandaoyun/model/http/ApiClient.java
@@ -1,6 +1,5 @@
 package com.doumee.core.jiandaoyun.model.http;
 
-import com.alibaba.fastjson.JSONObject;
 import com.doumee.core.jiandaoyun.util.LimitUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -120,12 +119,11 @@
      */
     public Map<String, Object> sendPostRequest(HttpRequestParam param) throws Exception {
         if (param == null || StringUtils.isBlank(param.getPath())) {
-            throw new Exception("缂哄け鍙傛暟锛�");
+            throw new RuntimeException("缂哄け鍙傛暟锛�");
         }
         HttpClient client = getSSLHttpClient();
         Header[] headers = getHttpHeaders(this.getApiKey());
         String url = this.host + param.getPath();
-        log.error("===绠�閬撲簯鎺ュ彛url锛�"+url);
         HttpRequestBase request = new HttpPost(url);
 
         // 璇锋眰鍙傛暟
@@ -150,11 +148,9 @@
             result = (Map<String, Object>) mapper.readValue(response.getEntity().getContent(), Object.class);
         }
         if (statusCode >= 400) {
-            log.error("===绠�閬撲簯鎺ュ彛锛氳姹傞敊璇紝statusCode:" + statusCode + ",Error Code: " + result.get("code") + ", Error Msg: " + result.get("msg"));
-            throw new Exception("璇锋眰閿欒锛宻tatusCode:" + statusCode + ",Error Code: " + result.get("code") + ", Error Msg: " + result.get("msg"));
+            throw new RuntimeException("璇锋眰閿欒锛宻tatusCode:" + statusCode + ",Error Code: " + result.get("code") + ", Error Msg: " + result.get("msg"));
         } else {
             // 澶勭悊杩斿洖缁撴灉
-            log.error("===绠�閬撲簯鎺ュ彛锛氳姹傛垚鍔焤esult:" + JSONObject.toJSONString(result));
             return result;
         }
     }
diff --git a/server/jiandaoyun_service/src/main/java/com/doumee/core/jiandaoyun/model/request/MemberPushData.java b/server/jiandaoyun_service/src/main/java/com/doumee/core/jiandaoyun/model/request/MemberPushData.java
index f3b992f..459f817 100644
--- a/server/jiandaoyun_service/src/main/java/com/doumee/core/jiandaoyun/model/request/MemberPushData.java
+++ b/server/jiandaoyun_service/src/main/java/com/doumee/core/jiandaoyun/model/request/MemberPushData.java
@@ -16,7 +16,6 @@
     private String sex;
     private String job_date;
     private String can_visit;//鍙嫓璁� 涓嶅彲鎷滆
-    private String master;//鏄� 鍚�
     private String phone;
     private String name;
     private String idcardno;
diff --git a/server/pom.xml b/server/pom.xml
index 60f3dff..8b2bb0f 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -18,6 +18,8 @@
       <module>system_gateway</module>
       <module>emaysms</module>
     <module>visits/device_service</module>
+      <module>jiandaoyun_service</module>
+      <module>base_serivce</module>
   </modules>
   <parent>
     <groupId>org.springframework.boot</groupId>
diff --git a/server/system_service/src/main/java/com/doumee/config/DataSyncConfig.java b/server/system_service/src/main/java/com/doumee/config/DataSyncConfig.java
index e3af880..9e0ad3f 100644
--- a/server/system_service/src/main/java/com/doumee/config/DataSyncConfig.java
+++ b/server/system_service/src/main/java/com/doumee/config/DataSyncConfig.java
@@ -15,13 +15,14 @@
         int jdy = 3;
         int dingding = 4;
     }
+
     /**
      *
-     鍐呴儴缁勭粐浜哄憳鏁版嵁 0鑷缓 2浠ユ捣搴峰畨闃插钩鍙颁负涓� 1鍗庢櫉ERP绯荤粺 3绠�閬撲簯 4閽夐拤
+     鍐呴儴缁勭粐浜哄憳鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺 3绠�閬撲簯 4閽夐拤
      */
     private Integer orgUserDataOrigin;
     /**
-     * 璁垮鏉ユ簮锛�0鑷缓 2浠ユ捣搴峰畨闃插钩鍙颁负涓� 1鍗庢櫉ERP绯荤粺 3绠�閬撲簯
+     * 璁垮鏉ユ簮锛�0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺 2绠�閬撲簯
      */
     private Integer visitorDataOrigin;
 
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 391f5a2..b5da3fd 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -60,6 +60,9 @@
     public static final String JK_PLAN_MAX_CLUSTER ="JK_PLAN_MAX_CLUSTER" ;
     public static final String JK_PLAN_DISTANCE_CLUSTER ="JK_PLAN_DISTANCE_CLUSTER" ;
     public static final String HK_PUSH_THIRD_URL ="HK_PUSH_THIRD_URL" ;
+    public static final String JDY_CAR_SECRET = " JDY_CAR_SECRET";
+    public static final String JDY_SECRET ="JDY_SECRET";
+    public static final String JDY_MEMBER_PUSH_STATUS_URL ="JDY_MEMBER_PUSH_STATUS_URL";
 
     /**
      * 鎿嶄綔绫诲瀷锛岀敤浜庡仛鎺ュ彛楠岃瘉鍒嗙粍
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index 6fe5dc6..d27f3b5 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -92,10 +92,11 @@
         Date nowAsISO = null;
         try {
             nowAsISO = df.parse(date);
-        } catch (ParseException e) {
+        } catch (Exception e) {
         }
         return nowAsISO;
     }
+
     public static Date getISO8601DateByStr2(String date)  {
         TimeZone tz = TimeZone.getTimeZone("Asia/Shanghai");
         if(date!=null ){
@@ -111,7 +112,7 @@
         Date nowAsISO = null;
         try {
             nowAsISO = df.parse(date);
-        } catch (ParseException e) {
+        } catch (Exception e) {
         }
         return nowAsISO;
     }
@@ -2967,49 +2968,7 @@
 
     public static void main(String[] args) {
         try {
-
-            LocalDate today = LocalDate.now();
-
-            // 鑾峰彇褰撳墠鏃ユ湡鏄槦鏈熷嚑
-            DayOfWeek dayOfWeek = today.getDayOfWeek();
-
-            // 璁＄畻鍛ㄤ竴鍜屽懆浜旂殑鏃ユ湡
-            LocalDate monday = today.with(DayOfWeek.MONDAY);
-            LocalDate friday = today.with(DayOfWeek.FRIDAY);
-
-            // 杈撳嚭鍛ㄤ竴鍜屽懆浜旂殑鏃ユ湡
-            System.out.println("Monday: " + monday.toString());
-            System.out.println("Friday: " + friday.toString());
-
-//            Date date = getISO8601DateByStr("2024-04-15T07:46:36.014+08:00");
-//            Date date1 = getISO8601DateByStr("2024-06-14T08:46:36.014+08:00");
-//            System.out.println(DateUtil.afterMinutesDate(-5));
-
-//            System.out.println(DateUtil.getWeekZhouOfDate(getDateFromString2("2025-11-06 00:00:00")));
-
-//            System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
-//            System.out.println(DateUtil.getBeforMonthStr(new Date(),12));
-
-//            List<Date> list =getThisMonthDateList();
-//            for(Date d :list){
-//                System.out.println(getPlusTime2(d));
-//            }
-//            List<Date> list1 =getThisYearMonthList();
-//            for(Date d :list1){
-//                System.out.println(getPlusTime2(d));
-//            }
-
-//            Date startTime = DateUtil.StringToDate("2024-05-01 08:00:00" ,"yyyy-MM-dd HH:mm:ss");
-//            Date endTime = DateUtil.StringToDate("2024-05-01 17:00:00" ,"yyyy-MM-dd HH:mm:ss");
-//            Long intervalTime = 35L;
-//
-//
-//            DateUtil.checkDateInterval( startTime.toInstant()
-//                    .atZone(ZoneId.systemDefault())
-//                    .toLocalDateTime(), endTime.toInstant()
-//                    .atZone(ZoneId.systemDefault())
-//                    .toLocalDateTime(),intervalTime);
-
+        System.out.println(getISO8601DateByStr("2025-12-26T03:08:39.123Z"));
         } catch (Exception ex) {
             ex.printStackTrace();
         }
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
index 34f2674..a5ccb0d 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -231,7 +231,7 @@
     private String companyPath;
     @ApiModelProperty(value = "缁勭粐淇℃伅")
     @TableField(exist = false)
-    private Company companyModel;
+    private Company company;
     @ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
     @TableField(exist = false)
     private Integer headId;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/JiandaoyunCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/JiandaoyunCloudController.java
index e783c90..0b057ba 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/JiandaoyunCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/JiandaoyunCloudController.java
@@ -122,8 +122,7 @@
             Map<String, String> parameterMap = parseParameter(request.getQueryString());
             String nonce = parameterMap.get("nonce");
             String timestamp = parameterMap.get("timestamp");
-            String signature = getSignature(nonce, payload,
-                    systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.JDY_SECRET).getCode(), timestamp);
+            String signature = getSignature(nonce, payload, systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.JDY_SECRET).getCode(), timestamp);
             log.error("銆愮畝閬撲簯銆戞暟鎹帹閫� =========getRequestURI锛歿}\n锛宷ueryParam锛歿}\n,payload:{}\n,绛惧悕锛歿}\n,姝ｇ‘绛惧悕:{}\n",request.getRequestURI(),request.getQueryString(),payload,jdy,signature);
             if (!signature.equals(jdy)) {
                 return  null;
@@ -164,11 +163,11 @@
     public static void main(String[] args) {
 /*
 */
-        String url = "https://lcdp.ahyc.com.cn:30443/api/v1/automation/tenant/61b6fb6080e9de2aa1df94d7/hooks/6954aca3cdf86954d2657433fb470ca1aabd108246925eca";
+        String url = "https://api.jiandaoyun.com/api/v1/automation/tenant/6909b792324dc197821895d1/hooks/6909d0fbdb93695219faa27eb068192dc4a9532972993159";
         JSONObject object = new JSONObject();
         object.put("status",0);
-        object.put("username","15345690849" );
-        object.put("info", "杩欐槸澶囨敞111");
+        object.put("username","20251104160000" );
+        object.put("info", "杩欐槸澶囨敞");
         String result = HttpsUtil.postJson(url,JSONObject.toJSONString(object));
         System.out.println(result);
     }
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
index 2e1efaa..3be58d6 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
@@ -24,4 +24,5 @@
   basic:
     enable: true
     username: admin
-    password: 111111
\ No newline at end of file
+    password: 111111
+
diff --git a/server/visits/dmvisit_service/pom.xml b/server/visits/dmvisit_service/pom.xml
index f2ae256..9aff8b7 100644
--- a/server/visits/dmvisit_service/pom.xml
+++ b/server/visits/dmvisit_service/pom.xml
@@ -24,6 +24,11 @@
         </dependency>
         <dependency>
             <groupId>com.doumee</groupId>
+            <artifactId>jiandaoyun_service</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.doumee</groupId>
             <artifactId>device_service</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 34f3fb1..756854a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -15,7 +15,6 @@
 import com.doumee.core.dingTalk.DingTalk;
 import com.doumee.core.erp.ErpConstants;
 import com.doumee.core.erp.model.openapi.request.erp.OrgListRequest;
-import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse;
 import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.haikang.model.HKConstants;
@@ -50,7 +49,6 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
-import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -196,6 +194,7 @@
 
         return false;
     }
+
 
     private OrgAddRequest getOrgAddModel(Company c ) {
         OrgAddRequest model = new OrgAddRequest();
@@ -807,11 +806,7 @@
                     deptIdList.add(deptId);
                 }
                 if(CollectionUtils.isNotEmpty(deptIdList)){
-                    syncDelCompany( companyMapper.selectList(new QueryWrapper<Company>()
-                            .lambda()
-                            .eq(Company::getIsdeleted,Constants.ZERO)
-                            .in(Company::getErpId,deptIdList)
-                    ));
+                    syncDelCompany(deptIdList);
                 }
             }else if(eventType.equals("org_dept_create")||eventType.equals("org_dept_modify")){
                 for (int i = 0; i < jsonArray.size(); i++) {
@@ -863,7 +858,7 @@
                     .in(Company::getId, delIds)
                     .notIn(fIds.size()>0,Company::getHkId, fIds));
             companyMapper.update(null,new UpdateWrapper<Company>().lambda()
-                    .set(Company::getHkStatus,Constants.ZERO)
+                    .set(Company::getHkStatus,Constants.TWO)
                     .set(Company::getHkDate,date)
                     .in(Company::getId, delIds)
                     .in(fIds.size()>0,Company::getHkId, fIds));
@@ -877,7 +872,7 @@
             if(list !=null && list.size()>0){
                 List<Company> addList = new ArrayList<>();
                 List<Company> updateList = new ArrayList<>();
-                List<Company> delIds = new ArrayList<>();//淇敼涓轰娇鐢ㄩ拤閽塱d  erpId
+                List<Long> delIds = new ArrayList<>();//淇敼涓轰娇鐢ㄩ拤閽塱d  erpId
                 List<Company>  allList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
                         .eq(Company::getIsdeleted,Constants.ZERO).eq(Company::getType,Constants.ONE));
                 dealCompanyChangeList(list,addList,updateList,delIds,allList);
@@ -896,28 +891,20 @@
     @Override
     public String syncJdyCompany() {
         //{
-        //  "dept_no": 1,//鏁板瓧 1 涓烘牴閮ㄩ棬缂栧彿銆�483636217锛氳姕婀栧競鍏徃
+        //  "dept_no": 1,//鏁板瓧 1 涓烘牴閮ㄩ棬缂栧彿銆�
         //  "has_child": true
         //}
-        DeptApiClient deptApiClient = new DeptApiClient(systemDictDataBiz.queryByCode(Constants.JDY_CONFIG, Constants.JDY_API_KEY).getCode()
-                ,systemDictDataBiz.queryByCode(Constants.JDY_CONFIG, Constants.JDY_API_HOST).getCode());
+        DeptApiClient deptApiClient = new DeptApiClient(HttpConstant.API_KEY, HttpConstant.HOST);
         try {
-            int root = 1;
-            try {
-                root = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.JDY_CONFIG, Constants.JDY_COMPANY_ROOT_NO).getCode());
-            }catch (Exception e){
-
-            }
-            Map<String, Object> result =  deptApiClient.deptList(root,true,deptApiClient.getDefaultVersion());
+            Map<String, Object> result =  deptApiClient.deptList(1,true,deptApiClient.getDefaultVersion());
             if(result!=null && result.get("departments")!=null ){
                 TypeReference<List<DeptEntityModel>> typeReference =     new TypeReference<List<DeptEntityModel>>(){};
                 Object obj = result.get("departments");
                 List<DeptEntityModel> list =  com.alibaba.fastjson.JSONObject.parseObject(JSON.toJSONString(obj), typeReference.getType());
-                list = sortJdyListBYParent(list,root);
                 if(list !=null && list.size()>0){
                     List<Company> addList = new ArrayList<>();
                     List<Company> updateList = new ArrayList<>();
-                    List<Company> delIds = new ArrayList<>();//淇敼涓轰娇鐢ㄩ拤閽塱d  erpId
+                    List<Long> delIds = new ArrayList<>();//淇敼涓轰娇鐢ㄩ拤閽塱d  erpId
                     List<Company>  allList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
                             .eq(Company::getIsdeleted,Constants.ZERO).eq(Company::getType,Constants.ONE));
                     dealCompanyChangeListJdy(list,addList,updateList,delIds,allList);
@@ -926,754 +913,18 @@
                     }
                     return "鍚屾鏁版嵁锛氭柊澧炪��"+addList.size()+"銆戞潯锛屾洿鏂般��"+updateList.size()+"銆戞潯锛屽垹闄ゃ��"+delIds.size()+"銆戞潯";
                 }else{
-                    throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍚屾绠�鍗曚簯鏁版嵁涓虹┖锛�");
+                    throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍚屾閽夐拤鏁版嵁涓虹┖锛�");
                 }
             }
-        }catch (BusinessException e){
-            throw  e;
         }catch (Exception e){
-            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍚屾鏁版嵁寮傚父锛�"+e.getMessage());
+            e.printStackTrace();
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍚屾鏁版嵁寮傚父锛�");
         }
+
         return null;
     }
 
-    private List<DeptEntityModel> sortJdyListBYParent(List<DeptEntityModel> list, int root) {
-        List<DeptEntityModel> all = new ArrayList<>();
-        for(DeptEntityModel t : list){
-            if(Constants.equalsInteger( t.getParent_no(),root)){
-                all.add(t);
-                if(hasChildCompany(list,t.getDept_no())){
-                    all.addAll(sortJdyListBYParent(list,t.getDept_no()));
-                }
-            }
-        }
-        return  all;
-    }
-
-
-    private boolean hasChildCompany(List<DeptEntityModel> list, Integer deptNo) {
-        for(DeptEntityModel t : list){
-            if(Constants.equalsInteger( t.getParent_no(),deptNo)){
-               return true;
-            }
-        }
-        return  false;
-    }
-
-    public static void main(String[] args) {
-        String temp = " [{" +
-                "\"dept_no\": 567064650," +
-                "\"name\": \"瀹¤娲鹃┗鍔瀄"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567064650\"" +
-                "}, {" +
-                "\"dept_no\": 567086523," +
-                "\"name\": \"姹熷寳鍒嗗眬\"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567086523\"" +
-                "}, {" +
-                "\"dept_no\": 567354485," +
-                "\"name\": \"绂诲矖閫�鍏讳汉鍛榎"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567354485\"" +
-                "}, {" +
-                "\"dept_no\": 567303494," +
-                "\"name\": \"绾鐩戝療瀹わ紙宸″療棰嗗灏忕粍鍔炲叕瀹わ級\"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567303494\"" +
-                "}, {" +
-                "\"dept_no\": 566874731," +
-                "\"name\": \"鏃犱负甯傚眬绂婚��浼戝姙\"," +
-                "\"parent_no\": 566426902," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566874731\"" +
-                "}, {" +
-                "\"dept_no\": 566426902," +
-                "\"name\": \"绂婚��浼戜汉鍛樺\"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566426902\"" +
-                "}, {" +
-                "\"dept_no\": 566981590," +
-                "\"name\": \"鐗╂祦涓績\"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566981590\"" +
-                "}, {" +
-                "\"dept_no\": 566499662," +
-                "\"name\": \"鏃犱负甯傚眬锛堣惀閿�閮級\"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566499662\"" +
-                "}, {" +
-                "\"dept_no\": 567258434," +
-                "\"name\": \"婀炬矚鍖哄眬锛堣惀閿�閮級\"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567258434\"" +
-                "}, {" +
-                "\"dept_no\": 567458554," +
-                "\"name\": \"涓撳崠鐩戠潱绠＄悊绉戯紙鍐呴儴涓撳崠绠＄悊鐩戠潱绉戙�佺ń鏌ユ敮闃燂級\"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567458554\"" +
-                "}, {" +
-                "\"dept_no\": 567139640," +
-                "\"name\": \"婀炬矚鍖哄眬绂婚��浼戝姙\"," +
-                "\"parent_no\": 566426902," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567139640\"" +
-                "}, {" +
-                "\"dept_no\": 566379775," +
-                "\"name\": \"淇℃伅涓績\"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566379775\"" +
-                "}, {" +
-                "\"dept_no\": 567298538," +
-                "\"name\": \"浼佷笟绠＄悊绉慭"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567298538\"" +
-                "}, {" +
-                "\"dept_no\": 567073617," +
-                "\"name\": \"鍔炲叕瀹"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567073617\"" +
-                "}, {" +
-                "\"dept_no\": 566496812," +
-                "\"name\": \"绻佹槍鍖哄眬绂婚��浼戝姙\"," +
-                "\"parent_no\": 566426902," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566496812\"" +
-                "}, {" +
-                "\"dept_no\": 566643894," +
-                "\"name\": \"鍗楅櫟鍘垮眬绂婚��浼戝姙\"," +
-                "\"parent_no\": 566426902," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566643894\"" +
-                "}, {" +
-                "\"dept_no\": 566699927," +
-                "\"name\": \"娉曡绉戯紙瑙勮寖绠＄悊鍔炲叕瀹わ級\"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566699927\"" +
-                "}, {" +
-                "\"dept_no\": 567034633," +
-                "\"name\": \"鍏氬缓缇ゅ洟绉戯紙宸ヤ細鍔炲叕瀹わ級\"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567034633\"" +
-                "}, {" +
-                "\"dept_no\": 567095650," +
-                "\"name\": \"甯傚眬锛堝叕鍙革級棰嗗\"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567095650\"" +
-                "}, {" +
-                "\"dept_no\": 566464722," +
-                "\"name\": \"璐㈠姟绠＄悊绉慭"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566464722\"" +
-                "}, {" +
-                "\"dept_no\": 567249497," +
-                "\"name\": \"鑺滄箹甯傚眬鐩村睘鍒嗗眬\"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567249497\"" +
-                "}, {" +
-                "\"dept_no\": 567266572," +
-                "\"name\": \"鍗楅櫟鍘垮眬锛堣惀閿�閮級\"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567266572\"" +
-                "}, {" +
-                "\"dept_no\": 567394584," +
-                "\"name\": \"绂婚��浼戜汉鍛樺\"," +
-                "\"parent_no\": 566426902," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567394584\"" +
-                "}, {" +
-                "\"dept_no\": 566952603," +
-                "\"name\": \"瀹夊叏绠＄悊绉慭"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566952603\"" +
-                "}, {" +
-                "\"dept_no\": 567418536," +
-                "\"name\": \"绻佹槍鍖哄眬锛堣惀閿�閮級\"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567418536\"" +
-                "}, {" +
-                "\"dept_no\": 567080624," +
-                "\"name\": \"钀ラ攢涓績\"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567080624\"" +
-                "}, {" +
-                "\"dept_no\": 567395495," +
-                "\"name\": \"浜哄姏璧勬簮绉慭"," +
-                "\"parent_no\": 483636217," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567395495\"" +
-                "}, {" +
-                "\"dept_no\": 566852695," +
-                "\"name\": \"鏃犱负甯傚眬锛堣惀閿�閮級鍔炲叕瀹"," +
-                "\"parent_no\": 566499662," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566852695\"" +
-                "}, {" +
-                "\"dept_no\": 566597911," +
-                "\"name\": \"鏃犱负甯傚眬锛堣惀閿�閮級瑗勫畨鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯銆佺ń鏌ヤ腑闃燂級\"," +
-                "\"parent_no\": 566499662," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566597911\"" +
-                "}, {" +
-                "\"dept_no\": 567383562," +
-                "\"name\": \"鏃犱负甯傚眬锛堣惀閿�閮級瀹㈡埛鏈嶅姟閮╘"," +
-                "\"parent_no\": 566499662," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567383562\"" +
-                "}, {" +
-                "\"dept_no\": 566596757," +
-                "\"name\": \"棰嗗鐝瓙\"," +
-                "\"parent_no\": 566499662," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566596757\"" +
-                "}, {" +
-                "\"dept_no\": 567126588," +
-                "\"name\": \"鏃犱负甯傚眬锛堣惀閿�閮級鍩庡尯鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯銆佺ń鏌ヤ腑闃燂級\"," +
-                "\"parent_no\": 566499662," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567126588\"" +
-                "}, {" +
-                "\"dept_no\": 567423457," +
-                "\"name\": \"鏃犱负甯傚眬锛堣惀閿�閮級鐩戝療娉曡鍔瀄"," +
-                "\"parent_no\": 566499662," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567423457\"" +
-                "}, {" +
-                "\"dept_no\": 567444447," +
-                "\"name\": \"鏃犱负甯傚眬锛堣惀閿�閮級楂樻矡鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯銆佺ń鏌ヤ腑闃燂級\"," +
-                "\"parent_no\": 566499662," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567444447\"" +
-                "}, {" +
-                "\"dept_no\": 566688696," +
-                "\"name\": \"鏃犱负甯傚眬锛堣惀閿�閮級涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級\"," +
-                "\"parent_no\": 566499662," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566688696\"" +
-                "}, {" +
-                "\"dept_no\": 567308492," +
-                "\"name\": \"鍗楅櫟鍘垮眬锛堣惀閿�閮級涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級琛屽姩缁刓"," +
-                "\"parent_no\": 567266572," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567308492\"" +
-                "}, {" +
-                "\"dept_no\": 567311569," +
-                "\"name\": \"涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級琛屽姩缁刓"," +
-                "\"parent_no\": 566499662," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567311569\"" +
-                "}, {" +
-                "\"dept_no\": 566586834," +
-                "\"name\": \"鐗╂祦涓績鍌ㄩ厤閮╘"," +
-                "\"parent_no\": 566981590," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566586834\"" +
-                "}, {" +
-                "\"dept_no\": 567052635," +
-                "\"name\": \"绋芥煡闃焅"," +
-                "\"parent_no\": 566930600," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567052635\"" +
-                "}, {" +
-                "\"dept_no\": 567250603," +
-                "\"name\": \"涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級琛屽姩缁刓"," +
-                "\"parent_no\": 567418536," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567250603\"" +
-                "}, {" +
-                "\"dept_no\": 566714645," +
-                "\"name\": \"鐗╂祦涓績閫佽揣閮╘"," +
-                "\"parent_no\": 566981590," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566714645\"" +
-                "}, {" +
-                "\"dept_no\": 567400554," +
-                "\"name\": \"鐗╂祦涓績缁煎悎閮╘"," +
-                "\"parent_no\": 566981590," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567400554\"" +
-                "}, {" +
-                "\"dept_no\": 901575528," +
-                "\"name\": \"鐗╂祦涓績鎶�鏈儴\"," +
-                "\"parent_no\": 566981590," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"901575528\"" +
-                "}, {" +
-                "\"dept_no\": 567406402," +
-                "\"name\": \"鐗╂祦涓績瀹変繚閮╘"," +
-                "\"parent_no\": 566981590," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567406402\"" +
-                "}, {" +
-                "\"dept_no\": 667523393," +
-                "\"name\": \"鐗╂祦涓績棰嗗\"," +
-                "\"parent_no\": 566981590," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"667523393\"" +
-                "}, {" +
-                "\"dept_no\": 567052636," +
-                "\"name\": \"涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級琛屽姩缁刓"," +
-                "\"parent_no\": 567249497," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567052636\"" +
-                "}, {" +
-                "\"dept_no\": 567351557," +
-                "\"name\": \"鐗╂祦涓績涓浆绔橽"," +
-                "\"parent_no\": 566981590," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567351557\"" +
-                "}, {" +
-                "\"dept_no\": 567052634," +
-                "\"name\": \"姹熷寳鍒嗗眬鍔炲叕瀹"," +
-                "\"parent_no\": 567086523," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567052634\"" +
-                "}, {" +
-                "\"dept_no\": 567359469," +
-                "\"name\": \"鍝佺墝閮╘"," +
-                "\"parent_no\": 567080624," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567359469\"" +
-                "}, {" +
-                "\"dept_no\": 821923828," +
-                "\"name\": \"缁煎悎閮╘"," +
-                "\"parent_no\": 567080624," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"821923828\"" +
-                "}, {" +
-                "\"dept_no\": 567151607," +
-                "\"name\": \"姹熷寳鍒嗗眬涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級\"," +
-                "\"parent_no\": 567086523," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567151607\"" +
-                "}, {" +
-                "\"dept_no\": 567297546," +
-                "\"name\": \"甯傚満閮╘"," +
-                "\"parent_no\": 567080624," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567297546\"" +
-                "}, {" +
-                "\"dept_no\": 566867618," +
-                "\"name\": \"缁堢閮╘"," +
-                "\"parent_no\": 567080624," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566867618\"" +
-                "}, {" +
-                "\"dept_no\": 567314532," +
-                "\"name\": \"璁㈠崟閮╘"," +
-                "\"parent_no\": 567080624," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567314532\"" +
-                "}, {" +
-                "\"dept_no\": 566848639," +
-                "\"name\": \"姹熷寳鍒嗗眬鐩戝療娉曡鍔瀄"," +
-                "\"parent_no\": 567086523," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566848639\"" +
-                "}, {" +
-                "\"dept_no\": 567272560," +
-                "\"name\": \"涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級瀵勯�掔粍\"," +
-                "\"parent_no\": 567258434," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567272560\"" +
-                "}, {" +
-                "\"dept_no\": 566564826," +
-                "\"name\": \"涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級琛屽姩缁刓"," +
-                "\"parent_no\": 567258434," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566564826\"" +
-                "}, {" +
-                "\"dept_no\": 567471441," +
-                "\"name\": \"姹熷寳鍒嗗眬瀹㈡埛鏈嶅姟閮╘"," +
-                "\"parent_no\": 567086523," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567471441\"" +
-                "}, {" +
-                "\"dept_no\": 711701716," +
-                "\"name\": \"姹熷寳鍒嗗眬鍩庡寳鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯锛塡"," +
-                "\"parent_no\": 567086523," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"711701716\"" +
-                "}, {" +
-                "\"dept_no\": 567103611," +
-                "\"name\": \"棰嗗鐝瓙\"," +
-                "\"parent_no\": 567086523," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567103611\"" +
-                "}, {" +
-                "\"dept_no\": 664801291," +
-                "\"name\": \"姹熷寳鍒嗗眬浜屽潩鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯锛塡"," +
-                "\"parent_no\": 567086523," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"664801291\"" +
-                "}, {" +
-                "\"dept_no\": 566323801," +
-                "\"name\": \"婀炬矚鍖哄眬锛堣惀閿�閮級鍔炲叕瀹"," +
-                "\"parent_no\": 567258434," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566323801\"" +
-                "}, {" +
-                "\"dept_no\": 567343637," +
-                "\"name\": \"婀炬矚鍖哄眬锛堣惀閿�閮級鍩庡尯鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯銆佺ń鏌ヤ腑闃燂級\"," +
-                "\"parent_no\": 567258434," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567343637\"" +
-                "}, {" +
-                "\"dept_no\": 567087584," +
-                "\"name\": \"婀炬矚鍖哄眬锛堣惀閿�閮級鐩戝療娉曡鍔瀄"," +
-                "\"parent_no\": 567258434," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567087584\"" +
-                "}, {" +
-                "\"dept_no\": 567058556," +
-                "\"name\": \"瀹㈡埛鏈嶅姟閮╘"," +
-                "\"parent_no\": 567249497," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567058556\"" +
-                "}, {" +
-                "\"dept_no\": 566930600," +
-                "\"name\": \"涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級\"," +
-                "\"parent_no\": 567249497," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566930600\"" +
-                "}, {" +
-                "\"dept_no\": 566592977," +
-                "\"name\": \"涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級琛屽姩缁刓"," +
-                "\"parent_no\": 567086523," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566592977\"" +
-                "}, {" +
-                "\"dept_no\": 567283502," +
-                "\"name\": \"棰嗗鐝瓙\"," +
-                "\"parent_no\": 567249497," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567283502\"" +
-                "}, {" +
-                "\"dept_no\": 567571030," +
-                "\"name\": \"鐩戝療娉曡鍔瀄"," +
-                "\"parent_no\": 567249497," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567571030\"" +
-                "}, {" +
-                "\"dept_no\": 566605742," +
-                "\"name\": \"婀炬矚鍖哄眬锛堣惀閿�閮級瀹㈡埛鏈嶅姟閮╘"," +
-                "\"parent_no\": 567258434," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566605742\"" +
-                "}, {" +
-                "\"dept_no\": 567044634," +
-                "\"name\": \"棰嗗鐝瓙\"," +
-                "\"parent_no\": 567258434," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567044634\"" +
-                "}, {" +
-                "\"dept_no\": 566835635," +
-                "\"name\": \"鍔炲叕瀹"," +
-                "\"parent_no\": 567249497," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566835635\"" +
-                "}, {" +
-                "\"dept_no\": 566844724," +
-                "\"name\": \"鍩庡崡鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯銆佺ń鏌ヤ腑闃燂級\"," +
-                "\"parent_no\": 567249497," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566844724\"" +
-                "}, {" +
-                "\"dept_no\": 566633782," +
-                "\"name\": \"棰嗗鐝瓙\"," +
-                "\"parent_no\": 567266572," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566633782\"" +
-                "}, {" +
-                "\"dept_no\": 566884644," +
-                "\"name\": \"鍗楅櫟鍘垮眬锛堣惀閿�閮級瀹㈡埛鏈嶅姟閮╘"," +
-                "\"parent_no\": 567266572," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566884644\"" +
-                "}, {" +
-                "\"dept_no\": 566656760," +
-                "\"name\": \"鍗楅櫟鍘垮眬锛堣惀閿�閮級涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級\"," +
-                "\"parent_no\": 567266572," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566656760\"" +
-                "}, {" +
-                "\"dept_no\": 567127606," +
-                "\"name\": \"婀炬矚鍖哄眬锛堣惀閿�閮級涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級\"," +
-                "\"parent_no\": 567258434," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567127606\"" +
-                "}, {" +
-                "\"dept_no\": 566965621," +
-                "\"name\": \"鍗楅櫟鍘垮眬锛堣惀閿�閮級鐩戝療娉曡鍔瀄"," +
-                "\"parent_no\": 567266572," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566965621\"" +
-                "}, {" +
-                "\"dept_no\": 566889723," +
-                "\"name\": \"鍗楅櫟鍘垮眬锛堣惀閿�閮級鍩庡尯鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯銆佺ń鏌ヤ腑闃燂級\"," +
-                "\"parent_no\": 567266572," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566889723\"" +
-                "}, {" +
-                "\"dept_no\": 573565486," +
-                "\"name\": \"鍗楅櫟鍘垮眬锛堣惀閿�閮級鍔炲叕瀹"," +
-                "\"parent_no\": 567266572," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"573565486\"" +
-                "}, {" +
-                "\"dept_no\": 566880674," +
-                "\"name\": \"鍗楅櫟鍘垮眬绂诲矖閫�鍏讳汉鍛榎"," +
-                "\"parent_no\": 567354485," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566880674\"" +
-                "}, {" +
-                "\"dept_no\": 567176623," +
-                "\"name\": \"绻佹槍鍘垮眬绂诲矖閫�鍏讳汉鍛榎"," +
-                "\"parent_no\": 567354485," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567176623\"" +
-                "}, {" +
-                "\"dept_no\": 567314533," +
-                "\"name\": \"鑺滄箹甯傚眬绂诲矖閫�鍏讳汉鍛榎"," +
-                "\"parent_no\": 567354485," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567314533\"" +
-                "}, {" +
-                "\"dept_no\": 567340287," +
-                "\"name\": \"鏃犱负鍘垮眬绂诲矖閫�鍏讳汉鍛榎"," +
-                "\"parent_no\": 567354485," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567340287\"" +
-                "}, {" +
-                "\"dept_no\": 566636715," +
-                "\"name\": \"鑺滄箹鍘垮眬绂诲矖閫�鍏讳汉鍛榎"," +
-                "\"parent_no\": 567354485," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566636715\"" +
-                "}, {" +
-                "\"dept_no\": 567368506," +
-                "\"name\": \"绻佹槍鍖哄眬锛堣惀閿�閮級鐩戝療娉曡鍔瀄"," +
-                "\"parent_no\": 567418536," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567368506\"" +
-                "}, {" +
-                "\"dept_no\": 567354486," +
-                "\"name\": \"绻佹槍鍖哄眬锛堣惀閿�閮級鍔炲叕瀹"," +
-                "\"parent_no\": 567418536," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567354486\"" +
-                "}, {" +
-                "\"dept_no\": 566960827," +
-                "\"name\": \"绻佹槍鍖哄眬锛堣惀閿�閮級涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級\"," +
-                "\"parent_no\": 567418536," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566960827\"" +
-                "}, {" +
-                "\"dept_no\": 566649730," +
-                "\"name\": \"绻佹槍鍖哄眬锛堣惀閿�閮級鍩庡尯鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯銆佺ń鏌ヤ腑闃燂級\"," +
-                "\"parent_no\": 567418536," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566649730\"" +
-                "}, {" +
-                "\"dept_no\": 566455834," +
-                "\"name\": \"绻佹槍鍖哄眬锛堣惀閿�閮級瀹㈡埛鏈嶅姟閮╘"," +
-                "\"parent_no\": 567418536," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566455834\"" +
-                "}, {" +
-                "\"dept_no\": 566975648," +
-                "\"name\": \"棰嗗鐝瓙\"," +
-                "\"parent_no\": 567418536," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"566975648\"" +
-                "}, {" +
-                "\"dept_no\": 822153494," +
-                "\"name\": \"鍖哄煙鍒嗕腑蹇僜"," +
-                "\"parent_no\": 567458554," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"822153494\"" +
-                "}, {" +
-                "\"dept_no\": 567328559," +
-                "\"name\": \"涓撳崠鐩戠潱绠＄悊绉戯紙鍐呴儴涓撳崠绠＄悊鐩戠潱绉戙�佺ń鏌ユ敮闃燂級琛屽姩缁刓"," +
-                "\"parent_no\": 567458554," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567328559\"" +
-                "}, {" +
-                "\"dept_no\": 567476616," +
-                "\"name\": \"涓撳崠鐩戠潱绠＄悊绉戯紙鍐呴儴涓撳崠绠＄悊鐩戠潱绉戙�佺ń鏌ユ敮闃燂級鏁版嵁鍒嗘瀽缁刓"," +
-                "\"parent_no\": 567458554," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"567476616\"" +
-                "}, {" +
-                "\"dept_no\": 821950791," +
-                "\"name\": \"鐜板満妫�鏌ョ粍\"," +
-                "\"parent_no\": 822153494," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"821950791\"" +
-                "}, {" +
-                "\"dept_no\": 922652428," +
-                "\"name\": \"缁煎悎绠＄悊缁刓"," +
-                "\"parent_no\": 822153494," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"922652428\"" +
-                "}, {" +
-                "\"dept_no\": 822188538," +
-                "\"name\": \"鏁版嵁鍒嗘瀽缁刓"," +
-                "\"parent_no\": 822153494," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"822188538\"" +
-                "}, {" +
-                "\"dept_no\": 981649568," +
-                "\"name\": \"閮ㄩ棬棰嗗\"," +
-                "\"parent_no\": 567080624," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"981649568\"" +
-                "}, {" +
-                "\"dept_no\": 982346282," +
-                "\"name\": \"閮ㄩ棬棰嗗\"," +
-                "\"parent_no\": 567458554," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"982346282\"" +
-                "}, {" +
-                "\"dept_no\": 998004621," +
-                "\"name\": \"閮ㄩ棬棰嗗\"," +
-                "\"parent_no\": 822153494," +
-                "\"type\": 0," +
-                "\"status\": 1," +
-                "\"integrate_id\": \"998004621\"" +
-                "}]" ;
-       TypeReference typeReference =
-                new TypeReference<     List<DeptEntityModel> >() {
-                };
-         List<DeptEntityModel> list = com.alibaba.fastjson.JSONObject.parseObject(temp, typeReference.getType());
-        CompanyServiceImpl obj = new CompanyServiceImpl();
-        list = obj.sortJdyListBYParent(list,483636217);
-        list.size();
-
-    }
-
-    private void dealCompanyChangeListJdy(List<DeptEntityModel> list, List<Company> addList, List<Company> updateList,
-                                          List<Company> delIds, List<Company> allList) {
+    private void dealCompanyChangeListJdy(List<DeptEntityModel> list, List<Company> addList, List<Company> updateList, List<Long> delIds, List<Company> allList) {
         Date date = new Date();
         for(DeptEntityModel respone : list){
             Company param = new Company();
@@ -1684,6 +935,7 @@
             //鏍规嵁erpid鏌ヨ浼佷笟淇℃伅锛屽垽鏂槸鏂板杩樻槸鏇存柊
             Company company = findCompanyByERPId(allList,respone.getDept_no().toString());
             if(company == null){
+                //濡傛灉鏄柊澧�
                 //灏佽鏂板缁勭粐瀵硅薄鏁版嵁
                 addList.add(getAddCompanyModel(param));
             }else{
@@ -1693,13 +945,12 @@
         if(allList!=null && allList.size()>0){
             for(Company  c : allList){
                 if(!isCompanyDeletedJdy(c,list)){
-                    delIds.add(c);
+                    delIds.add(Long.valueOf(c.getErpId()));
                 }
             }
         }
     }
-    private void dealCompanyChangeList(List<OapiV2DepartmentGetResponse.DeptGetResponse> list, List<Company> addList,
-                                       List<Company> updateList, List<Company> delIds, List<Company> allList) {
+    private void dealCompanyChangeList(List<OapiV2DepartmentGetResponse.DeptGetResponse> list, List<Company> addList, List<Company> updateList, List<Long> delIds, List<Company> allList) {
         Date date = new Date();
         for(OapiV2DepartmentGetResponse.DeptGetResponse respone : list){
             Company param = new Company();
@@ -1720,11 +971,12 @@
         if(allList!=null && allList.size()>0){
             for(Company  c : allList){
                 if(!isCompanyDeleted(c,list)){
-                    delIds.add(c);
+                    delIds.add(Long.valueOf(c.getErpId()));
                 }
             }
         }
     }
+
 
     /**
      * 鏁寸悊閽夐拤鍚屾 鏂板缁勭粐瀵硅薄
@@ -1743,6 +995,7 @@
     private Company getUpdateCompanyModel(Company param, Company company) {
         return syncDDEditCompanyModel(param,company);
     }
+
 
     /**
      * 鏍规嵁ERPID  鍒ゆ柇鏁版嵁鏄惁宸插湪闆嗗悎閲屽瓨鍦�
@@ -1790,6 +1043,10 @@
         company.setIsdeleted(Constants.ZERO);
         company.setStatus(Constants.ZERO);
 
+//        company.setName(deptGetResponse.getName());
+//        company.setErpId(deptGetResponse.getDeptId().toString());
+//        company.setErpParentId(deptGetResponse.getParentId().toString());
+//        company.setSortnum(deptGetResponse.getOrder().intValue());//榛樿鏈�涓婇潰
         company.setName(param.getName());
         company.setErpId(param.getErpId() );
         company.setErpParentId(param.getErpParentId());
@@ -1797,19 +1054,22 @@
 
         company.setType(Constants.ONE);
         String rootOrgId = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_ROOTORG_CODE).getCode();
-        String jdyRootId = systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.JDY_COMPANY_ROOT_NO).getCode();
-        Company root =getRootCompanyModel(rootOrgId,jdyRootId);
-        company.setHkParentId(rootOrgId);
+        Company root =getRootCompanyModel(rootOrgId);
         company.setCompanyPath(company.getId()+"/");//鍚嶇О璺緞
         company.setCompanyNamePath(company.getName());//鍚嶇О璺緞
+        company.setHkParentId(rootOrgId);
         String idPath = "";
-        if(StringUtils.isNotBlank(param.getErpParentId())){
-            Company parent = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,param.getErpParentId())
+        if(StringUtils.isNotBlank(company.getErpParentId())){
+            Company parent = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,company.getErpParentId())
                     .eq(Company::getIsdeleted,Constants.ZERO).last(" limit 1 "));
             if(parent == null || Constants.equalsInteger(parent.getIsdeleted(),Constants.ONE)){
                 //鐖剁骇涓嶅瓨鍦ㄧ殑锛岀洿鎺ユ寕鍦ㄦ牴缁勭粐涓�
                 parent = root;
+//                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鐖剁骇缁勭粐淇℃伅涓嶅瓨鍦▇");
             }
+//            if(StringUtils.isBlank(parent.getHkId())){
+//                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鐖剁骇缁勭粐淇℃伅灏氭湭鍚屾涓嬪彂鎴愬姛~");
+//            }
             if(Objects.nonNull(parent.getType())&&!Constants.equalsInteger(parent.getType(),-1)){
                 if(!Constants.equalsInteger(company.getType(),parent.getType())){
                     throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝缁勭粐淇℃伅閿欒");
@@ -1854,7 +1114,7 @@
      * @param rootOrgId
      * @return
      */
-    private Company getRootCompanyModel(String rootOrgId,String erpId) {
+    private Company getRootCompanyModel(String rootOrgId) {
         Company root = companyMapper.selectOne(new QueryWrapper<Company>().lambda()
                 .eq(Company::getIsdeleted,Constants.ZERO)
                 .isNull(Company::getParentId)
@@ -1871,7 +1131,6 @@
             root.setHkStatus(Constants.ONE);
             root.setIsdeleted(Constants.ZERO);
             root.setStatus(Constants.ZERO);
-            root.setErpId(erpId);
             root.setHkCompanyPath(rootOrgId+"/");
             root.setCompanyNamePath(root.getName());
             root.setHkDate(new Date());
@@ -1888,8 +1147,7 @@
     public Company syncDDEditCompanyModel(Company param,Company company){
         company.setErpParentId(param.getErpParentId().toString());
         String rootOrgId = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_ROOTORG_CODE).getCode();
-        String jdyRootId = systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.JDY_COMPANY_ROOT_NO).getCode();
-        Company root =getRootCompanyModel(rootOrgId,jdyRootId);
+        Company root =getRootCompanyModel(rootOrgId);
         String idPath = "";
         if(StringUtils.isNotBlank(company.getErpParentId())){
             Company parent = companyMapper.selectOne(new QueryWrapper<Company>().lambda()
@@ -1900,7 +1158,7 @@
             if(parent == null || Constants.equalsInteger(parent.getIsdeleted(),Constants.ONE)){
               parent =root;
             }
-           /*if(Objects.nonNull(parent.getType())&&!Constants.equalsInteger(parent.getType(),-1)){
+       /*   if(Objects.nonNull(parent.getType())&&!Constants.equalsInteger(parent.getType(),-1)){
                 if(!Constants.equalsInteger(company.getType(),parent.getType())){
                     throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝缁勭粐淇℃伅閿欒");
                 }
@@ -1939,15 +1197,16 @@
 
 
 
-    public void syncDelCompany(List<Company> companyList ){
-/*        List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>()
+    public void syncDelCompany(List<Long> deptIdList){
+        List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>()
                 .lambda()
                 .eq(Company::getIsdeleted,Constants.ZERO)
-                .in(Company::getId,deptIdList)
-        );*/
+                .in(Company::getErpId,deptIdList)
+        );
         if(CollectionUtils.isNotEmpty(companyList)){
             List<Integer> delIds = companyList.stream().map(i->i.getId()).collect(Collectors.toList());
             List<String> delHKIds = companyList.stream().filter(i->StringUtils.isNotBlank(i.getHkId())).map(i->i.getHkId()).collect(Collectors.toList());
+
             //鏍囪涓氬姟鍒犻櫎
             companyMapper.update(new UpdateWrapper<Company>().lambda()
                     .set(Company::getIsdeleted,Constants.ONE)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index 5627748..c30157f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -217,6 +217,12 @@
         if (pageWrap.getModel().getName() != null) {
             queryWrapper.lambda().like(Device::getName, pageWrap.getModel().getName());
         }
+        if (pageWrap.getModel().getDoorNo() != null) {
+            queryWrapper.lambda().like(Device::getDoorNo, pageWrap.getModel().getDoorNo());
+        }
+        if (pageWrap.getModel().getNo() != null) {
+            queryWrapper.lambda().like(Device::getNo, pageWrap.getModel().getNo());
+        }
         if (pageWrap.getModel().getDoorName() != null) {
             queryWrapper.lambda().like(Device::getDoorName, pageWrap.getModel().getDoorName());
         }
@@ -396,7 +402,7 @@
         }
         MqttClientCache.clientMapCache.put("device"+param.getId(),mqttClient);
         String curremak = "銆�"+param.getLoginUserInfo().getRealname()
-                +"銆戜簬"+ DateUtil.getPlusTime2(new Date()) +"杩涜浜�"+(Constants.equalsInteger(param.getStatus(),Constants.ONE)?"銆愬紑闂搞��":"銆愬叧闂搞��")+"鎿嶄綔,寮�鍏炽��"+param.getChannelNo()+"銆戯紱";
+                +"銆戜簬"+ DateUtil.getPlusTime2(new Date()) +"杩涜浜�"+(Constants.equalsInteger(param.getStatus(),Constants.ONE)?"銆愬悎闂搞��":"銆愬垎闂搞��")+"鎿嶄綔,寮�鍏炽��"+param.getChannelNo()+"銆戯紱";
         deviceMapper.update(null,new UpdateWrapper<Device>().lambda()
 //                        .setSql("remark = concat(ifnull(remark,''),'"+curremak+"','\n')")
                 .set(Device::getRemark,curremak)
@@ -414,7 +420,7 @@
         data.setVal1("杩滅▼鎺у埗");
         data.setVal2(curremak);
         data.setHappenTime(DateUtil.getPlusTime2(data.getCreateDate()));
-        data.setVal3((Constants.equalsInteger(param.getStatus(),Constants.ONE)?"銆愬紑闂搞��":"銆愬叧闂搞��"));
+        data.setVal3((Constants.equalsInteger(param.getStatus(),Constants.ONE)?"銆愬悎闂搞��":"銆愬垎闂搞��"));
         data.setVal4(param.getLoginUserInfo().getRealname());
         data.setVal5(param.getChannelNo());
         deviceDataMapper.insert(data);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 3a663eb..5b8ff5b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -182,19 +182,18 @@
         Member insert = initAddMemberModel(member,loginUserInfo);
         //娴峰悍浜哄憳鏂板涓氬姟
         try {
-            if(dealHkUserBiz(insert)){
-                insert.setHkStatus(Constants.ONE);
-                memberMapper.insert(insert);
-                //鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛�
-                //                if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
-                //濡傛灉鏄唴閮ㄧ粍缁囦汉鍛橈紝鏂板绯荤粺鐧婚檰璐﹀彿
-                systemUserMapper.insert(createSystemUser(insert,systemDictDataBiz));
-                //澶勭悊鍩硅鏈夋晥鏈熶笟鍔�
-                dealTrainTIme(member,0,loginUserInfo);
+//             if(dealHkUserBiz(insert)){
+            memberMapper.insert(insert);
+            //鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛�
+//                if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
+            //濡傛灉鏄唴閮ㄧ粍缁囦汉鍛橈紝鏂板绯荤粺鐧婚檰璐﹀彿
+            systemUserMapper.insert(createSystemUser(insert,systemDictDataBiz));
+            //澶勭悊鍩硅鏈夋晥鏈熶笟鍔�
+            dealTrainTIme(member,0,loginUserInfo);
 //                }
-            }else{
-                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
-            }
+//            }else{
+//                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+//            }
         }catch (BusinessException e){
             //濡傛灉鍙戠敓寮傚父锛屽垹闄ゅ凡缁忓垱寤虹殑浜哄憳淇℃伅
             deleteHkUserBiz(new String[]{insert.getHkId()});
@@ -258,7 +257,7 @@
         insert.setCanVisit(Constants.formatIntegerNum(member.getCanVisit()));//榛樿涓嶅彲璁块棶
         insert.setAuthStatus(Constants.ZERO);
         insert.setName(member.getName());
-//        insert.setHkId(UUID.randomUUID().toString().replace("-",""));
+        insert.setHkId(UUID.randomUUID().toString().replace("-",""));
         insert.setHkStatus(Constants.ZERO);
         insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
         insert.setJobDate(member.getJobDate());
@@ -402,7 +401,7 @@
                 .eq(Member::getIsdeleted,Constants.ZERO) ) >0){
             throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+member.getPhone()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
         }
-        Company company = member.getCompanyModel()!=null ?member.getCompanyModel(): companyMapper.selectById(member.getCompanyId());
+        Company company = member.getCompany()!=null ?member.getCompany(): companyMapper.selectById(member.getCompanyId());
         if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭凡琚垹闄わ紒");
         }
@@ -506,7 +505,7 @@
         }
         if(member.getCompanyId()!=null && !Constants.equalsInteger(member.getCompanyId(),model.getCompanyId())){
             //濡傛灉缁勭粐鍙戠敓鍙樺寲
-            Company company = member.getCompanyModel()!=null ?member.getCompanyModel(): companyMapper.selectById(member.getCompanyId());
+            Company company = member.getCompany()!=null ?member.getCompany(): companyMapper.selectById(member.getCompanyId());
             if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭凡琚垹闄わ紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
             }
@@ -969,45 +968,44 @@
         updateMember.setEditor(loginUserInfo!=null?loginUserInfo.getId():null);
         updateMember.setEditDate(new Date());
         //娴峰悍浜哄憳鏂板涓氬姟
-        if(dealHkUserForUpdateBiz(updateMember)){
-            updateMember.setHkStatus(Constants.ONE);
-            updateMember.setHkId(null);
-            updateMember.setAuthStatus(Constants.ZERO);
-            memberMapper.update(null,new UpdateWrapper<Member>().lambda()
-                    .set(Member::getStartTime,null)
-                    .set(Member::getEndTime,null)
-                    .set(Member::getRoleId,null)
-                    .set(StringUtils.isNotBlank(updateMember.getErpId()),Member::getErpId,updateMember.getErpId())
-                    .set(StringUtils.isNotBlank(updateMember.getDdId()),Member::getDdId,updateMember.getDdId())
-                    .set(StringUtils.isNotBlank(updateMember.getName()),Member::getName,updateMember.getName())
-                    .set(Member::getEditDate,updateMember.getEditDate())
-                    .set(Member::getEditor,updateMember.getEditor())
-                    .set(StringUtils.isNotBlank(updateMember.getName()),Member::getPinyin,Constants.getChinesePingyin(updateMember.getName()))
-                    .set(StringUtils.isNotBlank(updateMember.getIdcardNo()),Member::getIdcardNo,updateMember.getIdcardNo())
-                    .set(StringUtils.isNotBlank(updateMember.getIdcardDecode()),Member::getIdcardDecode,updateMember.getIdcardDecode())
-                    .set( Member::getAuthStatus,Constants.ZERO)
-                    .set(updateMember.getHkStatus()!=null,Member::getHkStatus,updateMember.getHkStatus())
-                    .set(updateMember.getSex()!=null,Member::getSex,updateMember.getSex())
-                    .set(updateMember.getCanVisit()!=null,Member::getCanVisit,updateMember.getCanVisit())
-                    .set(updateMember.getFaceStatus()!=null,Member::getFaceStatus,updateMember.getFaceStatus())
-                    .set(updateMember.getHkDate()!=null,Member::getHkDate,updateMember.getHkDate())
-                    .set(StringUtils.isNotBlank(updateMember.getRemark()),Member::getRemark,updateMember.getRemark())
-                    .set(StringUtils.isNotBlank(updateMember.getFaceImg()),Member::getFaceImg,updateMember.getFaceImg())
-                    .set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
-                    .set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
-                    .set(Member::getCode,updateMember.getCode())
-                    //                    .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
-                    .set( updateMember.getPositionId()!=null,Member::getPositionId,updateMember.getPositionId())
-                    .set( updateMember.getIsDangyuan()!=null,Member::getIsDangyuan,updateMember.getIsDangyuan())
-                    .set( updateMember.getJobDate()!=null,Member::getJobDate,updateMember.getJobDate())
-                    .eq(Member::getId,updateMember.getId()));
-            dealTrainTIme(updateMember,1,loginUserInfo);
-            cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
-            //璁板綍鎿嶄綔鏃ュ織
-            saveUserActionBiz(updateMember,loginUserInfo,Constants.UserActionType.EDIT,userActionJoinMapper,null);
-        }else{
-            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
-        }
+//        if(dealHkUserForUpdateBiz(updateMember)){
+        updateMember.setHkId(null);
+        updateMember.setAuthStatus(Constants.ZERO);
+        memberMapper.update(null,new UpdateWrapper<Member>().lambda()
+                .set(Member::getStartTime,null)
+                .set(Member::getEndTime,null)
+                .set(Member::getRoleId,null)
+                .set(StringUtils.isNotBlank(updateMember.getPhone()),Member::getPhone,updateMember.getPhone())
+                .set(StringUtils.isNotBlank(updateMember.getName()),Member::getName,updateMember.getName())
+                .set(Member::getEditDate,updateMember.getEditDate())
+                .set(Member::getEditor,updateMember.getEditor())
+                .set(StringUtils.isNotBlank(updateMember.getName()),Member::getPinyin,Constants.getChinesePingyin(updateMember.getName()))
+                .set(StringUtils.isNotBlank(updateMember.getIdcardNo()),Member::getIdcardNo,updateMember.getIdcardNo())
+                .set(StringUtils.isNotBlank(updateMember.getIdcardDecode()),Member::getIdcardDecode,updateMember.getIdcardDecode())
+                .set( Member::getAuthStatus,Constants.ZERO)
+                .set(updateMember.getHkStatus()!=null,Member::getHkStatus,updateMember.getHkStatus())
+                .set(updateMember.getSex()!=null,Member::getSex,updateMember.getSex())
+                .set(updateMember.getCanVisit()!=null,Member::getCanVisit,updateMember.getCanVisit())
+                .set(updateMember.getFaceStatus()!=null,Member::getFaceStatus,updateMember.getFaceStatus())
+                .set(updateMember.getHkDate()!=null,Member::getHkDate,updateMember.getHkDate())
+                .set(updateMember.getHkDate()!=null,Member::getHkDate,updateMember.getHkDate())
+                .set(StringUtils.isNotBlank(updateMember.getRemark()),Member::getRemark,updateMember.getRemark())
+                .set(StringUtils.isNotBlank(updateMember.getFaceImg()),Member::getFaceImg,updateMember.getFaceImg())
+                .set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
+                .set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
+                .set(Member::getCode,updateMember.getCode())
+//                    .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
+                .set( updateMember.getPositionId()!=null,Member::getPositionId,updateMember.getPositionId())
+                .set( updateMember.getIsDangyuan()!=null,Member::getIsDangyuan,updateMember.getIsDangyuan())
+                .set( updateMember.getJobDate()!=null,Member::getJobDate,updateMember.getJobDate())
+                .eq(Member::getId,updateMember.getId()));
+        dealTrainTIme(updateMember,1,loginUserInfo);
+        cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
+        //璁板綍鎿嶄綔鏃ュ織
+        saveUserActionBiz(updateMember,loginUserInfo,Constants.UserActionType.EDIT,userActionJoinMapper,null);
+//        }else{
+//            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+//        }
     }
 
     private void dealTrainTIme(Member updateMember, int i,LoginUserInfo loginUserInfo) {
@@ -2124,6 +2122,10 @@
     }
 
 
+
+
+
+
     @Override
     public StagingDataVO stagingHead(StagingDataVO stagingHeadVO){
         //浜哄憳淇℃伅
@@ -2476,61 +2478,38 @@
      */
     @Override
     public void dealJdyMemberInfo(MemberPushData data){
-        if(data.getDeleter()!=null){
-            //濡傛灉鏄凡缁忓垹闄や汉鍛橈紝涓嶅鐞� //鍐呴儴浜哄憳淇℃伅
-            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
-                    .eq( Member::getErpId,data.get_id() )
-                    .eq( Member::getIsdeleted,Constants.ZERO )
-                    .eq( Member::getType,Constants.TWO )
-                    .last("limit 1"));
-            if(member == null){
-                //濡傛灉鏄凡缁忓垹闄や汉鍛橈紝涓嶅鐞�
-                return;
-            }
-            //濡傛灉鏄凡缁忓垹闄や汉鍛�,鍒犻櫎鏈嶅姟涓績浜哄憳
-            this.deleteById(member.getId(),null);
-            return;
-        }
-
-        if(StringUtils.isBlank(data.get_id())
-                ||StringUtils.isBlank(data.getUsername())
+        if(StringUtils.isBlank(data.getUsername())
                 ||StringUtils.isBlank(data.getPhone())
                 ||StringUtils.isBlank(data.getName())){
             throw  new BusinessException(ResponseStatus.JDY_BAD_REQUEST.getCode(),"浜哄憳淇℃伅涓嶅畬鏁达紒");
         }
         //鍐呴儴浜哄憳淇℃伅
         Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
-                .eq( Member::getErpId,data.get_id() )
+                .eq( Member::getErpId,data.getUsername() )
                 .eq( Member::getIsdeleted,Constants.ZERO )
                 .eq( Member::getType,Constants.TWO )
                 .last("limit 1"));
-        if(member ==null){
-            //濡傛灉erpid鏈粦瀹氾紝鎸夋墜鏈哄彿鏌ヨ鐢ㄦ埛
-            member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
-                    .eq( Member::getPhone,data.getPhone() )
-                    .eq( Member::getIsdeleted,Constants.ZERO )
-                    .eq( Member::getType,Constants.TWO )
-                    .last("limit 1"));
-        }
-        boolean addOrEdit = false;
         if(member == null){
+            //鏂板浜哄憳
+            if(data.getDeleter()!=null){
+                //濡傛灉鏄凡缁忓垹闄や汉鍛橈紝涓嶅鐞�
+                return;
+            }
             member = getAddOrUpdateModelFromJDY(data,true);
             this.create(member);
-            addOrEdit=true;
         }else{
-            //鏇存柊浜哄憳淇℃伅
-            Member updateMember =getAddOrUpdateModelFromJDY(data,false);
-            updateMember.setId(member.getId());
-            addOrEdit=true;
-            this.updateById(updateMember);
+            //鏇存柊浜哄憳
+            if(data.getDeleter()!=null){
+                //濡傛灉鏄凡缁忓垹闄や汉鍛橈紝涓嶅鐞�
+                this.deleteById(member.getId(),null);
+            }else{
+                //鏇存柊浜哄憳淇℃伅
+                Member updateMember =getAddOrUpdateModelFromJDY(data,false);
+                updateMember.setId(member.getId());
+                this.updateById(updateMember);
+            }
         }
-        if(addOrEdit && Constants.equalsInteger(member.getHeadStatus(),Constants.ONE) && member.getCompanyModel()!=null){
-            //濡傛灉鏄儴闂ㄤ富绠�
-            Company updateCom = new Company();
-            updateCom.setHeadId(member.getId());
-            updateCom.setId(member.getCompanyModel().getId());
-            companyMapper.updateById(updateCom);//鏇存柊閮ㄩ棬涓荤浜哄憳
-        }
+
     }
 
     private Member getAddOrUpdateModelFromJDY(MemberPushData data, boolean add) {
@@ -2549,11 +2528,7 @@
         if(StringUtils.isNotBlank(data.getCan_visit())){
             member.setCanVisit(StringUtils.equals(data.getCan_visit(),"鍙嫓璁�")?1:0);
         }
-        if(StringUtils.isNotBlank(data.getMaster())){
-            member.setHeadStatus(StringUtils.equals(data.getMaster(),"鏄�")?1:0);
-        }
-        member.setErpId(data.get_id());
-        member.setDdId(data.getUsername());
+        member.setErpId(data.getUsername());
         if(data.getDepartment()!=null){
             member.setErpOrgId(data.getDepartment().getDept_no());
         }
@@ -2588,13 +2563,13 @@
         if(depart!=null){
             member.setCompanyId(depart.getId());
         }
-        member.setCompanyModel(depart);
+        member.setCompany(depart);
         return  member;
     }
 
     private String getMemberImgByJdyImg(String imgurl) {
         try {
-            String folder = systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+            String folder =   systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
             FtpUtil ftp = new FtpUtil(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_HOST).getCode(),
                     Integer.parseInt(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PORT).getCode()),
                     systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_USERNAME).getCode(),
@@ -2618,16 +2593,15 @@
                     selectAll(SystemUser.class )
                     .leftJoin(Member.class,Member::getId,SystemUser::getMemberId)
                     .eq(SystemUser::getDeleted,Boolean.FALSE)
-                    .eq(Member::getDdId,user.getUsername())
+                    .eq(Member::getErpId,user.getUsername())
                     .last("limit 1"));
         }
-        return null;
+       return null;
     }
 
     @Override
     public String syncJdyUserInfo() {
-        DeptApiClient deptApiClient = new DeptApiClient(systemDictDataBiz.queryByCode(Constants.JDY_CONFIG, Constants.JDY_API_KEY).getCode()
-                ,systemDictDataBiz.queryByCode(Constants.JDY_CONFIG, Constants.JDY_API_HOST).getCode());
+        DeptApiClient deptApiClient = new DeptApiClient(HttpConstant.API_KEY, HttpConstant.HOST);
         try {
             Map<String, Object> result =  deptApiClient.deptMemberList(1,true,deptApiClient.getDefaultVersion());
             if(result!=null && result.get("users")!=null ){

--
Gitblit v1.9.3