From 14afc8a0d7b1032218e2fd2a703be32e32e686a0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 22 八月 2024 18:02:15 +0800
Subject: [PATCH] 最新版本

---
 admin/src/views/business/deviceBroadcast.vue                                                                                  |    2 
 admin/src/views/business/deviceLed.vue                                                                                        |    2 
 admin/src/views/business/device.vue                                                                                           |    2 
 admin/src/views/vehicle/cars.vue                                                                                              |   35 ++++++-----
 admin/src/components/business/cardOpeningRecord.vue                                                                           |    4 
 admin/src/views/business/deviceRole.vue                                                                                       |    2 
 admin/src/views/business/deviceRole_f.vue                                                                                     |    2 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java                          |    8 +-
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromSelfServiceImpl.java |    1 
 admin/src/views/business/memberCard.vue                                                                                       |   20 +++---
 admin/src/views/vehicle/parkBook.vue                                                                                          |   60 ++++++++++---------
 11 files changed, 71 insertions(+), 67 deletions(-)

diff --git a/admin/src/components/business/cardOpeningRecord.vue b/admin/src/components/business/cardOpeningRecord.vue
index 1fc2444..132525f 100644
--- a/admin/src/components/business/cardOpeningRecord.vue
+++ b/admin/src/components/business/cardOpeningRecord.vue
@@ -36,8 +36,8 @@
             <el-table-column prop="memberName" label="鍛樺伐濮撳悕" min-width="100px"></el-table-column>
             <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
             <el-table-column prop="companyName" label="缁勭粐" min-width="100px"></el-table-column>
-            <el-table-column prop="createDate" label="寮�鍗℃椂闂�" min-width="100px"></el-table-column>
-            <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
+            <el-table-column prop="createDate" label="寮�鍗℃椂闂�" min-width="140px"></el-table-column>
+            <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="140px"></el-table-column>
             <el-table-column
                 label="鎿嶄綔"
                 min-width="120"
diff --git a/admin/src/views/business/device.vue b/admin/src/views/business/device.vue
index 1377701..e5d3caa 100644
--- a/admin/src/views/business/device.vue
+++ b/admin/src/views/business/device.vue
@@ -61,7 +61,7 @@
                         </el-switch>
                     </template>
                 </el-table-column>
-                <el-table-column prop="no" label="璁惧鍙�"></el-table-column>
+                <el-table-column prop="no" width="200px" label="璁惧鍙�"></el-table-column>
             </el-table>
             <pagination
                 @size-change="handleSizeChange"
diff --git a/admin/src/views/business/deviceBroadcast.vue b/admin/src/views/business/deviceBroadcast.vue
index c5d62e2..d0e5c49 100644
--- a/admin/src/views/business/deviceBroadcast.vue
+++ b/admin/src/views/business/deviceBroadcast.vue
@@ -2,7 +2,7 @@
     <TableLayout :permissions="['business:device:query']">
         <!-- 鎼滅储琛ㄥ崟 -->
         <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
-            <el-form-item label="鍚嶇О" prop="name">
+            <el-form-item title="鍚嶇О" prop="name">
                 <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
             </el-form-item>
             <section>
diff --git a/admin/src/views/business/deviceLed.vue b/admin/src/views/business/deviceLed.vue
index b8173fc..3ab4c39 100644
--- a/admin/src/views/business/deviceLed.vue
+++ b/admin/src/views/business/deviceLed.vue
@@ -2,7 +2,7 @@
     <TableLayout :permissions="['business:device:query']">
         <!-- 鎼滅储琛ㄥ崟 -->
         <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
-            <el-form-item label="鍚嶇О" prop="name">
+            <el-form-item title="鍚嶇О" prop="name">
                 <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
             </el-form-item>
             <section>
diff --git a/admin/src/views/business/deviceRole.vue b/admin/src/views/business/deviceRole.vue
index c2c96cb..97d0395 100644
--- a/admin/src/views/business/deviceRole.vue
+++ b/admin/src/views/business/deviceRole.vue
@@ -2,7 +2,7 @@
     <TableLayout :permissions="['business:devicerole:query']">
         <!-- 鎼滅储琛ㄥ崟 -->
         <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="110px" inline>
-            <el-form-item label="闂ㄧ鐐瑰垎缁勫悕绉�" prop="name">
+            <el-form-item title="闂ㄧ鐐瑰垎缁勫悕绉�" prop="name">
                 <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ラ棬绂佺偣鍒嗙粍鍚嶇О" @keypress.enter.native="search"></el-input>
             </el-form-item>
             <section>
diff --git a/admin/src/views/business/deviceRole_f.vue b/admin/src/views/business/deviceRole_f.vue
index 7b4273f..dde4a02 100644
--- a/admin/src/views/business/deviceRole_f.vue
+++ b/admin/src/views/business/deviceRole_f.vue
@@ -2,7 +2,7 @@
     <TableLayout :permissions="['business:devicerole:query']">
         <!-- 鎼滅储琛ㄥ崟 -->
         <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
-            <el-form-item label="闂ㄧ缁勫悕绉�" prop="name">
+            <el-form-item title="闂ㄧ缁勫悕绉�" prop="name">
                 <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ラ棬绂佺粍鍚嶇О" @keypress.enter.native="search"></el-input>
             </el-form-item>
             <section>
diff --git a/admin/src/views/business/memberCard.vue b/admin/src/views/business/memberCard.vue
index 8dae20d..9391141 100644
--- a/admin/src/views/business/memberCard.vue
+++ b/admin/src/views/business/memberCard.vue
@@ -2,20 +2,20 @@
     <TableLayout :permissions="['business:membercard:query']">
         <!-- 鎼滅储琛ㄥ崟 -->
         <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
-            <el-form-item label="鍗″彿" prop="code">
-                <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ崱鍙�" @keypress.enter.native="search"></el-input>
+            <el-form-item title="鍗″彿" prop="code">
+                <el-input v-model="searchForm.code" placeholder="鍗″彿" @keypress.enter.native="search"></el-input>
             </el-form-item>
-            <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyword">
-                <el-input v-model="searchForm.keyword" placeholder="璇疯緭鍏ュ憳宸ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+            <el-form-item title="濮撳悕/鎵嬫満鍙�" prop="keyword">
+                <el-input v-model="searchForm.keyword" placeholder="鍛樺伐濮撳悕/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
             </el-form-item>
-            <el-form-item label="鐢ㄦ埛绫诲瀷" prop="memberType">
-                <el-select v-model="searchForm.memberType" placeholder="璇烽�夋嫨">
+            <el-form-item title="鐢ㄦ埛绫诲瀷" prop="memberType">
+                <el-select v-model="searchForm.memberType" placeholder="鐢ㄦ埛绫诲瀷">
                     <el-option label="鍔冲姟浜哄憳" :value="0"></el-option>
                     <el-option label="鍐呴儴鍛樺伐" :value="2"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="鐘舵��" prop="status">
-                <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨">
+            <el-form-item title="鐘舵��" prop="status">
+                <el-select v-model="searchForm.status" placeholder="鐘舵��">
                     <el-option label="绂佺敤" :value="0"></el-option>
                     <el-option label="鍚敤" :value="1"></el-option>
                     <el-option label="閫�鍗�" :value="2"></el-option>
@@ -60,8 +60,8 @@
                 <el-table-column prop="memberName" label="鍛樺伐濮撳悕" min-width="100px"></el-table-column>
                 <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
                 <el-table-column prop="companyName" label="缁勭粐" min-width="100px"></el-table-column>
-                <el-table-column prop="createDate" label="寮�鍗℃椂闂�" min-width="100px"></el-table-column>
-                <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
+                <el-table-column prop="createDate" label="寮�鍗℃椂闂�" min-width="140px"></el-table-column>
+                <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="140px"></el-table-column>
                 <el-table-column
                     label="鎿嶄綔"
                     min-width="120"
diff --git a/admin/src/views/vehicle/cars.vue b/admin/src/views/vehicle/cars.vue
index be1ed7e..bdd6b22 100644
--- a/admin/src/views/vehicle/cars.vue
+++ b/admin/src/views/vehicle/cars.vue
@@ -1,24 +1,24 @@
 <template>
     <TableLayout :permissions="['business:member:query']">
         <!-- 鎼滅储琛ㄥ崟 -->
-        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
-            <el-form-item label="杞︾墝鍙�" prop="code">
-                <el-input v-model="searchForm.code" clearable placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
+        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+            <el-form-item label="" prop="code" title="杞︾墝鍙�">
+                <el-input v-model="searchForm.code" clearable placeholder="杞︾墝鍙�" @keypress.enter.native="search"></el-input>
             </el-form-item>
-          <el-form-item label="杞︿富濮撳悕/鎵嬫満鍙�" prop="memberName">
+          <el-form-item label="" prop="memberName" title="杞︿富濮撳悕/鎵嬫満鍙�">
             <el-input v-model="searchForm.memberName" clearable placeholder="杞︿富濮撳悕/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
           </el-form-item>
-          <el-form-item label="杞︿富閮ㄩ棬" prop="companyName">
+          <el-form-item label="" prop="companyName" title="杞︿富閮ㄩ棬鍚嶇О">
             <el-input v-model="searchForm.companyName" clearable placeholder="杞︿富閮ㄩ棬鍚嶇О" @keypress.enter.native="search"></el-input>
           </el-form-item>
-          <el-form-item label="鎺堟潈鐘舵��" prop="authStatus">
-            <el-select v-model="searchForm.authStatus" @keypress.enter.native="search" clearable placeholder="鏄惁鎺堟潈">
-              <el-option label="鏄�" value="1"></el-option>
-              <el-option label="鍚�" value="0"></el-option>
+          <el-form-item label="" prop="authStatus" title="鏄惁鎺堟潈">
+            <el-select v-model="searchForm.authStatus" @change="search" clearable placeholder="鏄惁鎺堟潈">
+              <el-option label="宸叉巿鏉�" value="1"></el-option>
+              <el-option label="鏈巿鏉�" value="0"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="杞﹁締绫诲瀷" prop="type">
-            <el-select v-model="searchForm.type" @keypress.enter.native="search" clearable placeholder="杞﹁締绫诲瀷">
+          <el-form-item label="" prop="type" title="杞﹁締绫诲瀷">
+            <el-select v-model="searchForm.type" @change="search" clearable placeholder="杞﹁締绫诲瀷">
              <el-option label="瀹夋嘲鍏姟杞�" value="0"></el-option>
               <el-option label="瀹夋嘲鑷湁鐗╂祦杞�" value="1"></el-option>
               <el-option label="鍏朵粬" value="2"></el-option>
@@ -59,7 +59,7 @@
                     <span v-else style="color: red">鍚�</span>
                   </template>
                 </el-table-column>
-                <el-table-column prop="parksName" label="宸叉巿鏉冨仠杞﹀満" min-width="200px">
+                <el-table-column prop="parksName" align="center" label="宸叉巿鏉冨仠杞﹀満" min-width="200px">
                   <template slot-scope="{row}">
                     <div  v-if="row.parkBookList && row.parkBookList.length" >
                       <span v-for="item in row.parkBookList"  :key="item.id" style="display: block">
@@ -69,24 +69,25 @@
                     <span  v-if="row.parkBookList ==null ||row.parkBookList.length ==0">-</span>
                   </template>
                 </el-table-column>
-              <el-table-column label="涓嬪彂鏈夋晥鏈�" min-width="170px">
+              <el-table-column label="涓嬪彂鏈夋晥鏈�" align="center" min-width="170px">
                 <template slot-scope="{row}">
                   <div v-if="row.authStatus !=null && row.authStatus == 1 && row.parkBookList!=null && row.parkBookList.length>0">
                     <div v-if="!row.startTime || !row.endTime">闀挎湡鏈夋晥</div>
                     <div v-else>
-                      <span>璧凤細{{row.startTime}}</span><br/>
-                      <span>姝細{{row.endTime}}</span>
+                      <span style="color: green">璧凤細{{row.startTime}}</span><br/>
+                      <span style="color: red">姝細{{row.endTime}}</span>
                     </div>
                   </div>
                   <div v-else >-</div>
                 </template>
               </el-table-column>
                 <el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
-                <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="100px"></el-table-column>
+                <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="140px"></el-table-column>
               <el-table-column
                   v-if="containPermissions(['business:member:update', 'business:member:delete','business:empower:create'])"
                   label="鎿嶄綔"
-                  min-width="250"
+                  min-width="200"
+                  align="center"
                   fixed="right"
               >
                 <template slot-scope="{row}">
diff --git a/admin/src/views/vehicle/parkBook.vue b/admin/src/views/vehicle/parkBook.vue
index adf8ffe..ee74c48 100644
--- a/admin/src/views/vehicle/parkBook.vue
+++ b/admin/src/views/vehicle/parkBook.vue
@@ -1,18 +1,18 @@
 <template>
     <TableLayout :permissions="['business:member:query']">
         <!-- 鎼滅储琛ㄥ崟 -->
-        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
-            <el-form-item label="杞︾墝鍙�" prop="carCode">
-                <el-input v-model="searchForm.carCode" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
+        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+            <el-form-item title="杞︾墝鍙�" prop="carCode">
+                <el-input v-model="searchForm.carCode" placeholder="杞︾墝鍙�" @keypress.enter.native="search"></el-input>
             </el-form-item>
-            <el-form-item label="杞︿富濮撳悕/鎵嬫満鍙�" prop="memberName">
-                <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ憳宸ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+            <el-form-item title="杞︿富濮撳悕/鎵嬫満鍙�" prop="memberName">
+                <el-input v-model="searchForm.memberName" placeholder="鍛樺伐濮撳悕/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
             </el-form-item>
-            <el-form-item label="杞︿富缁勭粐" prop="companyName">
-                <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ヨ溅涓荤粍缁�" @keypress.enter.native="search"></el-input>
+            <el-form-item title="杞︿富缁勭粐" prop="companyName">
+                <el-input v-model="searchForm.companyName" placeholder="杞︿富缁勭粐鍚嶇О" @keypress.enter.native="search"></el-input>
             </el-form-item>
-            <el-form-item label="鍋滆溅搴撳悕绉�" prop="parksName">
-                <el-input v-model="searchForm.parksName" placeholder="璇疯緭鍏ュ仠杞﹀簱鍚嶇О" @keypress.enter.native="search"></el-input>
+            <el-form-item title="鍋滆溅搴撳悕绉�" prop="parksName">
+                <el-input v-model="searchForm.parksName" placeholder="鍋滆溅搴撳悕绉�" @keypress.enter.native="search"></el-input>
             </el-form-item>
             <section>
                 <el-button type="primary" @click="search">鎼滅储</el-button>
@@ -33,8 +33,27 @@
                 @selection-change="handleSelectionChange"
             >
                 <el-table-column type="selection" width="55"></el-table-column>
-                <el-table-column prop="carCode" label="杞︾墝鍙�" min-width="100px"></el-table-column>
-                <el-table-column prop="parksName" label="鍋滆溅鍦�" min-width="100px"></el-table-column>
+                <el-table-column prop="carCode" label="杞︾墝鍙�" fixed min-width="100px"></el-table-column>
+                <el-table-column prop="parksName" label="鍋滆溅鍦�" fixed min-width="100px"></el-table-column>
+              <el-table-column prop="startTime" label="鏈夋晥鏈�"  align="center" fixed min-width="150px">
+                <template slot-scope="{row}">
+                  <div v-if="!row.startTime || !row.endTime">闀挎湡鏈夋晥</div>
+                  <div v-else>
+                    <span style="color: green">璧凤細{{row.startTime}}</span><br/>
+                    <span style="color: red">姝細{{row.endTime}}</span>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column prop="startTime" label="鐘舵��" fixed min-width="100px">
+                <template slot-scope="{row}">
+                  <div v-if="row.isdeleted==1"  style="color: red">宸插垹闄�</div>
+                  <div v-else style="color: green">
+                    <span v-if="row.hkStatus==0"  style="color: #435EBE">寰呬笅鍙�</span>
+                    <span v-if="row.hkStatus==1"  style="color: green">涓嬪彂鎴愬姛</span>
+                    <span v-if="row.hkStatus==2"  style="color: red">涓嬪彂澶辫触</span>
+                  </div>
+                </template>
+              </el-table-column>
                 <el-table-column label="鐢ㄦ埛绫诲瀷" min-width="100px">
                     <template slot-scope="{row}">
                         <span v-if="row.memberType === 0">鍔冲姟璁垮</span>
@@ -45,29 +64,12 @@
                 <el-table-column prop="memberName" label="濮撳悕" min-width="100px"></el-table-column>
                 <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
                 <el-table-column prop="companyName" label="缁勭粐" min-width="100px"></el-table-column>
-                <el-table-column prop="startTime" label="鏈夋晥鏈�" min-width="130px">
-                    <template slot-scope="{row}">
-                        <span>{{validity(row.startTime, row.endTime)}}</span>
-<!--                        <span v-if="!row.startTime || !row.endTime">闀挎湡</span>-->
-<!--                        <span v-else>{{row.startTime}} 鑷� {{row.endTime}}</span>-->
-                    </template>
-                </el-table-column>
-              <el-table-column prop="startTime" label="鐘舵��" min-width="100px">
-                <template slot-scope="{row}">
-                  <div v-if="row.isdeleted==1"  style="color: red">宸插垹闄�</div>
-                  <div v-else style="color: green">
-                      <span v-if="row.hkStatus==0"  style="color: #435EBE">寰呬笅鍙�</span>
-                      <span v-if="row.hkStatus==1"  style="color: green">涓嬪彂鎴愬姛</span>
-                     <span v-if="row.hkStatus==2"  style="color: red">涓嬪彂澶辫触</span>
-                   </div>
-                </template>
-              </el-table-column>
               <el-table-column prop="remark" label="澶囨敞" min-width="100px">
                 <template slot-scope="{row}">
                   <span v-if="row.isdeleted !=2">{{row.remark}}</span>
                 </template>
               </el-table-column>
-                <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+                <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="140px"></el-table-column>
 <!--                <el-table-column-->
 <!--                    v-if="containPermissions(['business:member:update', 'business:member:delete'])"-->
 <!--                    label="鎿嶄綔"-->
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 d398459..2c9996d 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
@@ -104,6 +104,7 @@
                 }
             }
             idPath = parent.getCompanyPath();
+            company.setHkParentId(parent.getHkId());
             company.setCompanyPath(parent.getCompanyPath()+company.getId()+"/");
             company.setCompanyNamePath(parent.getCompanyNamePath()+"/"+company.getName());
         }
@@ -156,6 +157,7 @@
     }
     private boolean delHkOrg(Company company) {
         OrgDelRequest request =new OrgDelRequest();
+
         request.setIndexCodes(new String[]{company.getHkId()});
         BaseResponse<List<OrgUpdateFailureResponse>> result =  HKService.delBatchOrg(request);
         if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
@@ -232,6 +234,7 @@
                 .eq(Member::getIsdeleted,Constants.ZERO)) >0){
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇ラ儴闂ㄤ笅瀛樺湪浜哄憳淇℃伅锛屼笉鑳借繘琛屽垹闄ゆ搷浣滐紒");
         }
+
         Company company = new Company();
         company.setId(id);
         company.setEditDate(new Date());
@@ -241,7 +244,7 @@
         company.setHkDate(company.getHkDate());
         companyMapper.updateById(company);
         //涓嬪彂娴峰悍瀹夐槻骞冲彴
-        if(StringUtils.isBlank(model.getHkId()) && Constants.equalsInteger(Constants.ONE,model.getHkStatus()) && !delHkOrg(model)){
+        if(StringUtils.isNotBlank(model.getHkId()) && Constants.equalsInteger(Constants.ONE,model.getHkStatus()) && !delHkOrg(model)){
             throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍒犻櫎涓嬪彂澶辫触锛岃纭璇ョ粍缁囨棤涓嬬骇缁勭粐鎴栫粍缁囦汉鍛樹俊鎭瘇");
         }
     }
@@ -483,13 +486,11 @@
         companyMapper.updateById(company);
     }
 
-
     @Override
     public long count(Company company) {
         QueryWrapper<Company> wrapper = new QueryWrapper<>(company);
         return companyMapper.selectCount(wrapper);
     }
-
 
     @Override
     public List<CompanyDTO> findCompanyTreePage(Integer type) {
@@ -501,7 +502,6 @@
         List<Company> companies = companyMapper.selectList(wrapper);
         return getCompanyTree( companies, null);
     }
-
 
     private List<CompanyDTO> getCompanyTree(List<Company> companies, String parentId){
         if (CollectionUtils.isEmpty(companies)){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromSelfServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromSelfServiceImpl.java
index 0609a80..d310af4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromSelfServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromSelfServiceImpl.java
@@ -274,6 +274,7 @@
             c.setHkStatus(Constants.ONE);
             c.setHkDate(new Date());
             c.setCanVisit(Constants.ZERO);
+            c.setWorkStatus(Constants.ZERO);
             c.setHighCheckor(Constants.ZERO);
             c.setSex(model.getGender());
             c.setIsdeleted(Constants.ZERO);

--
Gitblit v1.9.3