From 6bf26cf68e5188affb9f3fe3694456638769007e Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 13 五月 2024 18:04:48 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/system_service/src/main/java/com/doumee/core/utils/Constants.java                                                    |   58 +
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java                                 |  104 ++-
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java                         |   16 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java                    |    1 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java                          |    3 
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java                                |    2 
 admin/src/utils/form.js                                                                                                     |   33 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java |    1 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java |    1 
 server/meeting/meeting_service/src/main/resources/banner.txt                                                                |   18 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java                           |    1 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java                                 |    1 
 admin/src/views/meeting/bookings.vue                                                                                        |   13 
 server/system_service/src/main/resources/mappers/SystemUserMapper.xml                                                       |   16 
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java                                       |   13 
 admin/src/views/meeting/components/OperaRoomsWindow.vue                                                                     |    5 
 server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java                               |    4 
 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java                      |   19 
 admin/src/api/business/member.js                                                                                            |   12 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java                         |  707 ++++++++++++++++-----
 server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java                                             |    5 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java                      |    2 
 server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java                                                     |   20 
 admin/src/views/meeting/rooms.vue                                                                                           |    2 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java                     |    2 
 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java                                     |   43 -
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java                                       |   48 +
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java  |    5 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java                                  |   35 
 /dev/null                                                                                                                   |   13 
 admin/src/components/business/OperaMemberWindow.vue                                                                         |  155 ++++
 admin/src/views/business/internalCompany.vue                                                                                |    2 
 server/system_service/src/main/java/com/doumee/dao/business/dao/CompanyMapper.java                                          |    2 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java                     |    2 
 server/system_service/src/main/java/com/doumee/dao/business/dao/join/CompanyJoinMapper.java                                 |   11 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java                         |   14 
 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java                                      |  274 +------
 server/system_service/src/main/java/com/doumee/dao/business/model/Company.java                                              |   15 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java                        |   13 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java                        |    3 
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java                                   |    4 
 admin/src/views/business/internalMember.vue                                                                                 |  165 ++++
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java                                   |    4 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java   |    2 
 44 files changed, 1,220 insertions(+), 649 deletions(-)

diff --git a/admin/src/api/business/member.js b/admin/src/api/business/member.js
index c529a5f..0c358ae 100644
--- a/admin/src/api/business/member.js
+++ b/admin/src/api/business/member.js
@@ -28,11 +28,23 @@
 export function create (data) {
   return request.post('/visitsAdmin/cloudService/business/member/create', data)
 }
+export function memberList (data) {
+  return request.post('/visitsAdmin/cloudService/business/member/list', data)
+}
 
 // 淇敼
 export function updateById (data) {
   return request.post('/visitsAdmin/cloudService/business/member/updateById', data)
 }
+export function updateHead (data) {
+  return request.post('/visitsAdmin/cloudService/business/member/updateHead', data)
+}
+export function updateWorkStatus (data) {
+  return request.post('/visitsAdmin/cloudService/business/member/updateWorkStatus', data)
+}
+export function updateCanVisit (data) {
+  return request.post('/visitsAdmin/cloudService/business/member/updateCanVisitById', data)
+}
 
 // 鎵归噺鎷夐粦
 export function batchBlock (ids) {
diff --git a/admin/src/components/business/OperaMemberWindow.vue b/admin/src/components/business/OperaMemberWindow.vue
new file mode 100644
index 0000000..19be014
--- /dev/null
+++ b/admin/src/components/business/OperaMemberWindow.vue
@@ -0,0 +1,155 @@
+<template>
+    <GlobalWindow
+        :title="title"
+        width="60%"
+        :visible.sync="visible"
+        :confirm-working="isWorking"
+        @confirm="confirm"
+    >
+        <el-form :model="form" ref="form" :rules="rules">
+            <el-form-item label="濮撳悕" prop="name">
+                <el-input v-model="form.name" placeholder="璇疯緭鍏ュ鍚�" v-trim/>
+            </el-form-item>
+            <el-form-item label="鎵�灞炵粍缁�" prop="companyId">
+              <el-cascader
+                  v-model="form.company"
+                  :options="department"
+                  @change="handleChangeCompany"
+                  :show-all-levels="false"
+                  clearable
+                  :props="departprops"
+              ></el-cascader>
+            </el-form-item>
+            <el-form-item label="鎵嬫満鍙�" prop="phone">
+                <el-input v-model="form.phone" placeholder="璇疯緭鍏ユ墜鏈哄彿" v-trim/>
+              <div style="color: #F56C6C;font-size: 12px">锛堟敞锛氬憳宸ユ墜鏈哄彿灏嗕綔涓哄钩鍙扮櫥褰曡处鍙凤紝鍒濆瀵嗙爜涓虹郴缁熼粯璁ゅ瘑鐮侀厤缃」锛�</div>
+            </el-form-item>
+            <el-form-item label="韬唤璇佸彿" prop="idcardNo" v-if="form.id ==null">
+                <el-input v-model="form.idcardNo" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" v-trim/>
+            </el-form-item>
+            <el-form-item label="淇敼韬唤璇佸彿" prop="idcardNoNew" v-if="form.id !=null">
+                <el-input v-model="form.idcardNoNew" placeholder="鍙慨鏀硅韩浠借瘉鍙�" v-trim/>
+              <div style="font-size: 12px" v-if="form.id !=null">
+                锛堟敞锛氬綋鍓嶈韩浠借瘉鍙蜂负<span style="color: #F56C6C">銆恵{form.idcardDecode}}銆�</span>锛屽闇�淇敼锛岃鍦ㄨ緭鍏ユ爮濉啓鏂扮殑韬唤璇佸彿!锛�
+              </div>
+            </el-form-item>
+            <el-form-item label="宸ュ彿" prop="code">
+                <el-input v-model="form.code" placeholder="璇疯緭鍏ュ憳宸ュ伐鍙�" v-trim/>
+            </el-form-item>
+          <el-form-item label="浜鸿劯鐓х墖" prop="faceImgFull" >
+            <UploadAvatarImage
+                :file="{ 'imgurlfull': form.faceImgFull, 'imgurl': form.faceImg }"
+                :uploadData="uploadData"
+                @uploadSuccess="uploadAvatarSuccess"
+                @uploadEnd="isUploading = false"
+                @uploadBegin="isUploading = true"
+            />
+          </el-form-item>
+</el-form>
+</GlobalWindow>
+</template>
+
+<script>
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import UploadAvatarImage from '@/components/common/UploadAvatarImage'
+import {checkMobile, validIdCardNo, validIdCardNoNew} from '@/utils/form'
+export default {
+  name: 'OperaCompanyWindow',
+  extends: BaseOpera,
+  components: { GlobalWindow, UploadAvatarImage },
+  data () {
+    return {
+      uploadData: {
+        folder: 'member'
+      },
+      departprops: {
+        label: 'name',
+        value: 'id',
+        checkStrictly: true
+      },
+      department: [],
+      // 琛ㄥ崟鏁版嵁
+      form: {
+        id: null,
+        name: '',
+        type: '',
+        company: [],
+        code: '',
+        idcardNo: '',
+        idcardNoNew: '',
+        linkName: '',
+        idcardDecode: '',
+        companyId: null,
+        idcardType: 0,
+        phone: '',
+        faceImg: '',
+        faceImgFull: ''
+      },
+      // 楠岃瘉瑙勫垯
+      rules: {
+        name: [{ required: true, message: '璇疯緭鍏ュ憳宸ュ鍚�', trigger: 'blur' }],
+        phone: [{ required: true, validator: checkMobile, trigger: 'blur' }],
+        companyId: [{ required: true, message: '璇烽�夋嫨鎵�灞炵粍缁�' }],
+        idcardNo: [{ required: true, validator: validIdCardNo, message: '璇疯緭鍏ヨ韩浠借瘉鍙�', trigger: 'blur' }],
+        idcardNoNew: [{ required: false, validator: validIdCardNoNew, trigger: 'blur' }]
+      }
+    }
+  },
+  created () {
+    this.config({
+      api: '/business/member.js',
+      'field.id': 'id'
+    })
+  },
+  methods: {
+    handleChangeCompany (value) {
+      if (this.form.company && this.form.company.length > 1) {
+        this.form.companyId = this.form.company[this.form.company.length - 1]
+      }
+    },
+    /**
+     * 鎵撳紑绐楀彛
+     * @title 绐楀彛鏍囬
+     * @target 缂栬緫鐨勫璞�
+     */
+    open (title, target, depart) {
+      this.title = title
+      this.department = depart
+      this.visible = true
+      // 鏂板缓
+      if (target == null) {
+        this.$nextTick(() => {
+          this.$refs.form.resetFields()
+          this.form[this.configData['field.id']] = null
+          this.form.company = []
+        })
+        return
+      }
+      // 缂栬緫
+      var that = this
+      this.$nextTick(() => {
+        for (const key in this.form) {
+          this.form[key] = target[key]
+          this.form.idcardNo = ''
+        }
+        this.form.company =[]
+        if (target.companyId && target.companyPath) {
+          var array = target.companyPath.split('/')
+          array.forEach(item => {
+            if (item && item != null && item != '') {
+              that.form.company.push(parseInt(item))
+            }
+          })
+        }
+        console.log(that.form.company)
+      })
+    },
+    // 涓婁紶鍥剧墖
+    uploadAvatarSuccess (file) {
+      this.form.faceImg = file.imgurl
+      this.form.faceImgFull = file.imgurlfull
+    }
+  }
+}
+</script>
diff --git a/admin/src/utils/form.js b/admin/src/utils/form.js
index 52ef5cf..bb53d89 100644
--- a/admin/src/utils/form.js
+++ b/admin/src/utils/form.js
@@ -1,7 +1,7 @@
 // 楠岃瘉鎵嬫満鍙风爜
 export function checkMobile (rule, value, callback) {
   if (value == null || value.trim() === '') {
-    callback()
+    callback(new Error('璇疯緭鍏ユ纭殑鎵嬫満鍙�'))
     return
   }
   if (!/^1\d{10}$/.test(value)) {
@@ -24,8 +24,7 @@
   callback()
 }
 
-
-export function numRule(rule, value, callback) {
+export function numRule (rule, value, callback) {
   // debugger
   if (value == null || value < 0 || !value) {
     callback(new Error())
@@ -33,7 +32,7 @@
     callback()
   }
 }
-export function arrayRule(rule, value, callback) {
+export function arrayRule (rule, value, callback) {
   // debugger
   if (value == null || value.length <= 0 || !value) {
     callback(new Error())
@@ -69,13 +68,31 @@
     }
     return
   }
-  let re = /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/
+  const re = /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/
   var result = re.test(value)
-  if(!result) {
+  if (!result) {
     callback(new Error('璇疯緭鍏ユ纭殑绀句細淇＄敤浠ｇ爜'))
   } else {
     callback()
   }
 }
-
-
+export function validIdCardNo (rule, value, callback) {
+  const pattern = /^[1-9]\d{5}(18|19|20)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|[Xx])$/
+  if (value == null || value.trim() ==='') {
+    callback(new Error('璇疯緭鍏ヨ韩浠借瘉鍙�'))
+  } else if (!pattern.test(value)) {
+    callback(new Error('璇疯緭鍏ユ纭殑韬唤璇佸彿'))
+  } else {
+    callback()
+  }
+}
+export function validIdCardNoNew (rule, value, callback) {
+  const pattern = /^[1-9]\d{5}(18|19|20)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|[Xx])$/
+  if (value == null || value.trim() ==='') {
+    callback()
+  } else if (!pattern.test(value)) {
+    callback(new Error('璇疯緭鍏ユ纭殑韬唤璇佸彿'))
+  } else {
+    callback()
+  }
+}
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index b34143c..7057fc3 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -39,7 +39,7 @@
                       <span v-if="row.type == 1">鍐呴儴缁勭粐</span>
                   </template>
                 </el-table-column>
-                <el-table-column prop="companyPath" label="缁勭粐璺緞" min-width="100px"></el-table-column>
+                <el-table-column prop="companyNamePath" label="缁勭粐璺緞" min-width="100px"></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
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index a192b7c..0777433 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -31,6 +31,9 @@
                     <el-option label="鍚屾澶辫触" value="2"></el-option>
                 </el-select>
             </el-form-item>
+          <el-form-item label=""  >
+              <el-checkbox style="font-size: 12px"  label="1" v-model="searchForm.includeChild" key="1"  >鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
+          </el-form-item>
             <section>
                 <el-button type="primary" @click="search">鎼滅储</el-button>
                 <el-button @click="reset">閲嶇疆</el-button>
@@ -44,10 +47,13 @@
         </template>
         <!-- 琛ㄦ牸鍜屽垎椤� -->
         <template v-slot:table-wrap>
-            <ul class="toolbar" v-permissions="['business:member:delete','business:member:sync']">
+            <ul class="toolbar" v-permissions="['business:member:delete','business:member:create']">
 <!--                <li><el-button type="primary">闂ㄧ鎺堟潈</el-button></li>-->
+<!--
                 <li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>
-                <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鍒犻櫎</el-button></li>
+-->
+                <li><el-button type="primary" @click="$refs.OperaMemberWindow.open('鏂板缓鍛樺伐',null,department)"  icon="el-icon-plus" v-permissions="['business:member:create']">鏂板缓鍛樺伐</el-button></li>
+                <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
             </ul>
             <el-table
                 v-loading="isWorking.search"
@@ -58,6 +64,7 @@
                 <el-table-column type="selection" width="55"></el-table-column>
                 <el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
                 <el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
+                <el-table-column prop="idcardDecode" label="韬唤璇佸彿" min-width="100px"></el-table-column>
                 <el-table-column label="鎬у埆" min-width="100px">
                     <template slot-scope="{row}">
                         <span v-if="row.sex == 1">鐢�</span>
@@ -72,7 +79,36 @@
                         <span v-if="row.status == 2" style="color: red">鎷夐粦/鍐荤粨</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
+              <el-table-column label="閮ㄩ棬绫诲瀷" min-width="100px">
+                <template slot-scope="{row}">
+                  <span v-if="row.companyType == 0">鐩稿叧鏂圭粍缁�</span>
+                  <span v-if="row.companyType == 1">鍐呴儴缁勭粐</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="鍦ㄨ亴鐘舵��">
+              <template slot-scope="{row}">
+                <el-switch
+                    @change="changeWorkStatus($event, row)"
+                    v-model="row.workStatus"
+                    active-color="#13ce66"
+                    inactive-color="#ff4949"
+                    :active-value="0"
+                    :inactive-value="1">
+                </el-switch>
+              </template>
+            </el-table-column>
+              <el-table-column label="鏄惁鍙嫓璁�">
+                <template slot-scope="{row}">
+                  <el-switch
+                      @change="changeCanvisit($event, row)"
+                      v-model="row.canVisit"
+                      active-color="#13ce66"
+                      inactive-color="#ff4949"
+                      :active-value="1"
+                      :inactive-value="0">
+                  </el-switch>
+                </template>
+              </el-table-column>
                 <el-table-column label="鍙嫓璁�" min-width="100px">
                     <template slot-scope="{row}">
                         <span v-if="row.canVisit != 1">鍚�</span>
@@ -87,34 +123,47 @@
                         <span v-if="row.hkStatus == 3" style="color: red">涓嶇鍚堜笅鍙戞潯浠�</span>
                 </template>
                 </el-table-column>
+                <el-table-column label="鏄惁鎺堟潈" min-width="100px">
+                  <template slot-scope="{row}">
+                    <span v-if="row.authStatus == 1" style="color: green">鏄�</span>
+                    <span v-if="row.authStatus == 0" style="color: red">鍚�</span>
+                  </template>
+                </el-table-column>
                 <el-table-column label="闂ㄧ瑙掕壊" min-width="100px">
                     <template slot-scope="{row}">
-                        <span>{{row.roleNames.join(',')}}</span>
+                        <span>{{(row.roleNames && row.roleNames.length) ?row.roleNames.join(','): '-'}}</span>
                     </template>
                 </el-table-column>
+              <el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
+              <el-table-column label="鍗＄墖" min-width="80px">
+                <template slot-scope="{row}">
+                  <el-button @click="$refs.cardOpeningRecord.open('寮�鍗¤褰�', row.id)" type="text">{{row.memberCardCount || '0'}}</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
+              <el-table-column prop="editDate" label="鏈�鍚庢搷浣滄椂闂�" min-width="150px"></el-table-column>
                 <el-table-column fixed="right" label="浜鸿劯淇℃伅" min-width="100px">
                     <template slot-scope="{row}">
                         <el-image
-                            v-if="row.faceImg"
+                            v-if="row.faceImgFull"
                             style="width: 60px; height: 60px"
-                            :src="row.faceImg"
-                            :preview-src-list="[row.faceImg]">
+                            :src="row.faceImgFull"
+                            :preview-src-list="[row.faceImgFull]">
                         </el-image>
-                    </template>
-                </el-table-column>
-                <el-table-column fixed="right" label="鍗＄墖淇℃伅" min-width="100px">
-                    <template slot-scope="{row}">
-                        <el-button @click="$refs.cardOpeningRecord.open('寮�鍗¤褰�', row.id)" type="text">{{row.memberCardCount || '0'}}</el-button>
                     </template>
                 </el-table-column>
                 <el-table-column
                     v-if="containPermissions(['business:member:update', 'business:member:delete','business:empower:create'])"
                     label="鎿嶄綔"
-                    min-width="120"
+                    min-width="280"
                     fixed="right"
                 >
                     <template slot-scope="{row}">
-                        <el-button type="text" @click="empower(row.id)" v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
+                        <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅',row,department)" v-permissions="['business:empower:update']">缂栬緫</el-button>
+                        <el-button type="text" :loading="heading" icon="el-icon-delete" @click="updateHead(row,0)" v-if="row.headStatus ==1 " v-permissions="['business:member:head']">鍙栨秷涓荤</el-button>
+                        <el-button type="text" :loading="heading"  icon="el-icon-edit" @click="updateHead(row,1)"  v-if="row.headStatus  == 0"  v-permissions="['business:member:head']">璁句负涓荤</el-button>
+                        <el-button type="text"  icon="el-icon-plus" @click="empower(row.id)" v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
+                        <el-button  type="text"  icon="el-icon-delete" @click="empower(row.id)" v-permissions="['business:empower:delete']">鍒犻櫎</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -126,6 +175,7 @@
             </pagination>
             <!--    鏌ョ湅浜哄憳寮�鍗¤褰�    -->
             <cardOpeningRecord ref="cardOpeningRecord" @success="handlePageChange" />
+            <OperaMemberWindow ref="OperaMemberWindow" @success="handlePageChange" />
         </template>
     </TableLayout1>
 </template>
@@ -136,12 +186,13 @@
 import Pagination from '@/components/common/Pagination'
 import cardOpeningRecord from '@/components/business/cardOpeningRecord'
 import Tree from '@/components/common/Tree'
+import OperaMemberWindow from '@/components/business/OperaMemberWindow'
 import { fetchList } from '@/api/business/company'
-import { memberSync, roleAuth } from '@/api/business/member'
+import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
 export default {
   name: 'internalMember',
   extends: BaseTable,
-  components: { TableLayout1, Pagination, Tree, cardOpeningRecord },
+  components: { TableLayout1, Pagination, Tree, cardOpeningRecord, OperaMemberWindow },
   data () {
     return {
       TreeList: [],
@@ -150,6 +201,7 @@
         name: '',
         status: '',
         hkStatus: '',
+        includeChild: false,
         canVisit: '',
         keyword: '',
         type: 2,
@@ -157,8 +209,12 @@
         companyId: '',
         hasFace: ''
       },
-      loading:false,
-      companyTree: []
+      loading: false,
+      heading: false,
+      working: false,
+      canvisiting: false,
+      companyTree: [],
+      department: []
     }
   },
   created () {
@@ -172,7 +228,7 @@
     this.getfindCompanyTreePage()
   },
   methods: {
-    empower(id) {
+    empower (id) {
       var that = this
       this.$confirm('纭畾閲嶆柊鎺堟潈鍚�?', '鎻愮ず', {
         confirmButtonText: '纭畾',
@@ -181,11 +237,12 @@
       }).then(() => {
         roleAuth(id)
           .then(res => {
+            this.$tip.apiSuccess(res || '鎿嶄綔鎴愬姛')
             that.search()
           })
       }).catch(() => {
-
-      });
+        this.$tip.apiSuccess(  '鎿嶄綔澶辫触')
+      })
     },
     // 鑾峰彇缁勭粐鏍�
     getfindCompanyTreePage () {
@@ -196,8 +253,26 @@
             this.companyTree = res
             // this.searchForm.erpOrgId = res[0].erpId
             this.search()
+            this.department = this.getDepartmentTree(res)
           }
         })
+    },
+    getDepartmentTree (tree) {
+      if (tree == null) {
+        return []
+      }
+      return tree.map(item => {
+        const newItem = { ...item }
+        if (newItem) {
+          newItem.children = newItem.childList
+        }
+        if (item.children && item.children.length == 0) {
+          this.$delete(newItem, 'children')
+        } else {
+          newItem.children = this.getDepartmentTree(newItem.children)
+        }
+        return newItem
+      })
     },
     // 鍚屾淇℃伅
     async synchronous () {
@@ -218,6 +293,54 @@
         })
         .catch(() => {})
     },
+    async updateHead (row, type) {
+      this.$dialog.actionConfirm('鎮ㄧ‘璁よ繘琛屽綋鍓嶆搷浣滃悧锛�', '閮ㄩ棬涓荤璁剧疆鎿嶄綔鎻愮ず')
+          .then(() => {
+        this.heading = true
+        updateHead({ id: row.id, headStatus: type })
+          .then(res => {
+            this.$tip.apiSuccess(res || '鎿嶄綔鎴愬姛')
+            this.search()
+          })
+          .catch(e => {
+            this.$tip.apiFailed(e)
+          })
+          .finally(() => {
+            this.heading = false
+          })
+          .catch(() => {})
+          })
+    },
+    changeWorkStatus (e, row) {
+      this.working = true
+      updateWorkStatus({ id: row.id, workStatus: e })
+        .then(res => {
+          this.$tip.apiSuccess(res || '鎿嶄綔鎴愬姛')
+          this.search()
+        })
+        .catch(e => {
+          this.$tip.apiFailed(e)
+        })
+        .finally(() => {
+          this.working = false
+        })
+        .catch(() => {})
+    },
+     changeCanvisit (e, row) {
+      this.canvisiting = true
+      updateCanVisit({ id: row.id, canVisit: e })
+        .then(res => {
+          this.$tip.apiSuccess(res || '鎿嶄綔鎴愬姛')
+          this.search()
+        })
+        .catch(e => {
+          this.$tip.apiFailed(e)
+        })
+        .finally(() => {
+          this.canvisiting = false
+        })
+        .catch(() => {})
+    },
     callback (row) {
       this.searchForm.erpOrgId = row.erpId
       this.searchForm.companyId = row.id
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index e0c4f2f..2be5978 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -141,7 +141,7 @@
 import OperaBookingsDetailWindow from '@/views/meeting/components/OperaBookingsDetailWindow'
 import { findList } from '@/api/meeting/rooms'
 import { getSystemDictData } from '@/api/system/dictData'
-import { fetchTree } from '@/api/system/department'
+import { fetchList } from '@/api/business/company'
 import { cancelById, bookingsDetail } from '@/api/meeting/bookings'
 export default {
   name: 'Bookings',
@@ -163,7 +163,6 @@
         isdeleted: '',
         remark: '',
         name: '',
-        roomId: '',
         startTime: '',
         endTime: '',
         content: ''
@@ -199,7 +198,7 @@
       'field.id': 'id',
       'field.main': 'id'
     })
-    fetchTree()
+    fetchList(1)
       .then(res => {
         this.department = this.newTree(res)
       })
@@ -216,9 +215,15 @@
   },
   methods: {
     newTree(tree) {
+      if(tree ==null){
+        return []
+      }
       return tree.map(item => {
         let newItem = {...item}
-        if (item.children.length == 0) {
+        if(newItem){
+          newItem.children=newItem.childList
+        }
+        if (item.children && item.children.length == 0) {
           this.$delete( newItem, 'children' )
         } else {
           newItem.children = this.newTree(newItem.children)
diff --git a/admin/src/views/meeting/components/OperaRoomsWindow.vue b/admin/src/views/meeting/components/OperaRoomsWindow.vue
index cbb22d9..a3aa091 100644
--- a/admin/src/views/meeting/components/OperaRoomsWindow.vue
+++ b/admin/src/views/meeting/components/OperaRoomsWindow.vue
@@ -42,8 +42,7 @@
             v-for="item in userList()"
             :key="item.id"
             :value="item.id"
-
-            :label="item.department?`${item.department.name}-${item.realname}`:item.realname"
+            :label="item.companyId?`${item.companyName}-${item.companyName}`:item.realname"
           />
         </el-select>
       </el-form-item>
@@ -101,7 +100,7 @@
         id: null,
         sysList: [],
         projectList: [],
-        createDate: null,
+        createDate: '',
         editor: '',
         editDate: null,
         isdeleted: 0,
diff --git a/admin/src/views/meeting/rooms.vue b/admin/src/views/meeting/rooms.vue
index d75760a..b29a7c0 100644
--- a/admin/src/views/meeting/rooms.vue
+++ b/admin/src/views/meeting/rooms.vue
@@ -18,7 +18,7 @@
             v-for="item in userList"
             :key="item.id"
             :value="item.id"
-            :label="item.department?`${item.department.name}-${item.realname}`:item.realname"
+            :label="item.companyId?`${item.companyName}-${item.companyName}`:item.realname"
             ></el-option>
             <!-- :label="`${item.department.name}-${item.realname}`" -->
           <!-- <el-option :key="1" :value="1" label="绂佺敤" /> -->
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index eff84fa..d3a0a58 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -452,14 +452,11 @@
         queryWrapper.selectAll(Bookings.class);
         queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
         queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
-        queryWrapper.selectAs(SystemDepartment::getName, Bookings::getDepartmentName);
+        queryWrapper.selectAs(Company::getName, Bookings::getDepartmentName);
 
         queryWrapper.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId);
         queryWrapper.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator);
-
-        queryWrapper.leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator);
-        queryWrapper.leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId);
-
+        queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
         queryWrapper.orderByDesc(Bookings::getCreateDate);
         queryWrapper.eq(Bookings::getIsdeleted, MeetConstants.ZERO);
 
@@ -467,7 +464,7 @@
         queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()), Bookings::getName, pageWrap.getModel().getName());
         queryWrapper.eq(pageWrap.getModel().getStatus() != null, Bookings::getStatus, pageWrap.getModel().getStatus());
         queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getRealName()), SystemUser::getRealname, pageWrap.getModel().getRealName());
-        queryWrapper.eq(pageWrap.getModel().getDepartmentId() != null, SystemDepartment::getId, pageWrap.getModel().getDepartmentId());
+        queryWrapper.eq(pageWrap.getModel().getDepartmentId() != null, SystemUser::getId, pageWrap.getModel().getDepartmentId());
 
         if (pageWrap.getModel().getStartTime() != null) {
             queryWrapper.ge(Bookings::getStartTime, pageWrap.getModel().getStartTime());
@@ -533,11 +530,10 @@
         queryWrapper.selectAll(Bookings.class);
         queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
         queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
-        queryWrapper.selectAs(SystemDepartment::getName, Bookings::getDepartmentName);
+        queryWrapper.selectAs(Company::getName, Bookings::getDepartmentName);
         queryWrapper.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId);
         queryWrapper.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator);
-        queryWrapper.leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator);
-        queryWrapper.leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId);
+        queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
         queryWrapper.eq(Bookings::getIsdeleted, MeetConstants.ZERO);
         queryWrapper.eq(queryParam.getId() != null, Bookings::getId, queryParam.getId());
         queryWrapper.eq(queryParam.getRoomId() != null, Bookings::getRoomId, queryParam.getRoomId());
@@ -996,7 +992,7 @@
 
         lambdaWrapper.selectAll(Bookings.class)
                         .selectAs(SystemUser::getRealname, Bookings::getRealName)
-                        .selectAs(SystemDepartment::getName, Bookings::getDepartmentName)
+                        .selectAs(Company::getName, Bookings::getDepartmentName)
                         .selectAs(Rooms::getName, Bookings::getRoomName)
                 .select("CASE DAYOFWEEK(t.START_TIME)\n" +
                         "\tWHEN 1 THEN \t\"鏄熸湡鏃" \tWHEN 2 THEN \"鏄熸湡涓�\"\n" +
@@ -1010,8 +1006,7 @@
               //  .leftJoin(RoomTime.class, RoomTime::getId, BookingTime::getTimeId)
                 .leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator)
                 .leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId)
-                .leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator)
-                .leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId)
+                .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                 .eq(Objects.nonNull(roomId), Bookings::getRoomId, roomId)
                 .eq(Bookings::getIsdeleted, MeetConstants.ZERO)
                 .eq(Bookings::getStatus, MeetConstants.ZERO)
diff --git a/server/meeting/meeting_service/src/main/resources/banner.txt b/server/meeting/meeting_service/src/main/resources/banner.txt
index e1d9b57..e6519fd 100644
--- a/server/meeting/meeting_service/src/main/resources/banner.txt
+++ b/server/meeting/meeting_service/src/main/resources/banner.txt
@@ -2,17 +2,17 @@
 ${AnsiColor.BLUE}
 ================================================================================
 
-                             娆㈣繋浣跨敤浼婂▋妗嗘灦锛堝崟搴旂敤鐗堬級
+                             娆㈣繋浣跨敤璞嗙背妗嗘灦锛堝崟搴旂敤鐗堬級
                                  Version :: 1.0
 
-                         鈻堚枅鈻堚枅鈻堚枅鈻堚枅 鈻堚枅      鈻堚枅     鈻堚枅
-                        鈻戔枅鈻堚枒鈻戔枒鈻戔枒 鈻戔枅鈻�     鈻戔枅鈻�    鈻堚枅鈻堚枅
-                        鈻戔枅鈻�      鈻戔枅鈻�     鈻戔枅鈻�   鈻堚枅鈻戔枒鈻堚枅
-                        鈻戔枅鈻堚枅鈻堚枅鈻堚枅 鈻戔枒鈻堚枅    鈻堚枅   鈻堚枅  鈻戔枒鈻堚枅
-                        鈻戔枅鈻堚枒鈻戔枒鈻�   鈻戔枒鈻堚枅  鈻堚枅   鈻堚枅鈻堚枅鈻堚枅鈻堚枅鈻堚枅
-                        鈻戔枅鈻�        鈻戔枒鈻堚枅鈻堚枅   鈻戔枅鈻堚枒鈻戔枒鈻戔枒鈻戔枅鈻�
-                        鈻戔枅鈻堚枅鈻堚枅鈻堚枅鈻�   鈻戔枒鈻堚枅    鈻戔枅鈻�     鈻戔枅鈻�
-                        鈻戔枒鈻戔枒鈻戔枒鈻戔枒     鈻戔枒     鈻戔枒      鈻戔枒
+                         鈻堚枅鈻堚枅鈻堚枅鈻堚枅         鈻堚枅       鈻堚枅
+                        鈻戔枅鈻堚枒鈻戔枒鈻戔枒 鈻堚枅     鈻戔枅鈻堚枒鈻堚枅    鈻堚枅 鈻堚枅
+                        鈻戔枅鈻�     鈻戔枒鈻堚枅   鈻戔枅鈻� 鈻戔枒鈻堚枅  鈻堚枅 鈻戔枒鈻堚枅
+                        鈻戔枅鈻�      鈻戔枅鈻�  鈻戔枅鈻�   鈻戔枒鈻堚枅鈻堚枅   鈻戔枒鈻堚枅
+                        鈻戔枅鈻�      鈻戔枅鈻� 鈻戔枅鈻�     鈻戔枒鈻堚枅     鈻戔枒鈻堚枅
+                        鈻戔枅鈻�      鈻堚枅  鈻戔枅鈻�      鈻戔枅鈻�      鈻戔枅鈻�
+                        鈻戔枅鈻堚枅鈻堚枅鈻堚枅鈻堚枒   鈻戔枅鈻�      鈻戔枅鈻�      鈻戔枅鈻�
+                        鈻戔枒鈻戔枒鈻戔枒鈻戔枒     鈻戔枒       鈻戔枒       鈻戔枒
 
       鍚姩绔彛: ${server.port}  鍚姩鐜: ${project.env}  鏃ュ織绛夌骇: ${logback.level}  鍚敤Swagger: ${swagger.enabled}
 
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 2bdbd58..ba0ee22 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
@@ -591,6 +591,64 @@
 
     }
 
+    /**
+     * 鍛樺伐淇℃伅缁存姢鎿嶄綔鍘嗗彶绫诲瀷 0瑙ｅ喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎 10鏇存柊 11鎺堟潈闂ㄧ鏉冮檺 12绂昏亴 13鎭㈠鍦ㄨ亴
+     */
+    public  enum UserActionType {
+        CANCEL_FREEZE(0, "瑙ｅ喕","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愯В鍐汇��" ),
+        FREEZE(1, "鍐荤粨","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愬喕缁撱��" ),
+        BLACKLIST(2, "鎷夐粦","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愭媺榛戙��"),
+        CANCEL_BLACKLIST(3, "鎭㈠","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愮Щ鍑洪粦鍚嶅崟銆�" ),
+        CANVISIT(4, "璁句负鎷滆浜�","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愯涓烘嫓璁夸汉銆�" ),
+        CANCEL_VISIT(5, "鍙栨秷鎷滆浜�","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愬彇娑堟嫓璁夸汉銆�" ),
+        //缁繚閫氱煡
+        HIGHCHECKOR(6, "璁句负楂樼骇瀹℃壒浜�","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愯涓洪珮绾у鎵逛汉銆�" ),
+        CANCEL_HIGHCHECKOR(7, "鍙栨秷楂樼骇瀹℃壒浜�","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愬彇娑堥珮绾у鎵逛汉銆�" ),
+        LEVEL(8, "鎵嬪姩绂诲満","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愭墜鍔ㄧ鍦恒��" ),
+        DELETE(9, "鍒犻櫎","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愬垹闄ゃ��" ),
+        EDIT(10, "鏇存柊","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愭洿鏂般��" ),
+        AUTH_ROLE(11, "鎺堟潈闂ㄧ鏉冮檺","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愭巿鏉冮棬绂佹潈闄愩��" ),
+        WORK_OFF(12, "绂昏亴","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愮鑱屻�戞搷浣�" ),
+        WORK_ON(13, "鍦ㄨ亴","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愬湪鑱屻�戞搷浣�" ),
+        ;
+
+        // 鎴愬憳鍙橀噺
+        private int key;
+        private String name;
+        private String info;
+
+        // 鏋勯�犳柟娉�
+        UserActionType(int key, String name,String info ) {
+            this.key = key;
+            this.info = info;
+            this.name = name;
+        }
+
+        public int getKey() {
+            return key;
+        }
+
+        public void setKey(int key) {
+            this.key = key;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getInfo() {
+            return info;
+        }
+
+        public void setInfo(String info) {
+            this.info = info;
+        }
+    }
+
     public  enum NoticeObjectType {
         MEETING_BOOK_SUCCESS(0, "浼氫笌棰勫畾鎴愬姛","浼氫笌棰勫畾鎴愬姛"),
         MEETING_CACEL(1, "浼氳鍙栨秷","浼氳鍙栨秷"),
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 2ccb323..d68a093 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
@@ -1876,11 +1876,10 @@
     }
 
     public static int compareDate(String format, String str1, Date date2) {
-
         Date date1 = null;
         try {
             date1 = fromStringToDate(format, str1);
-        } catch (ParseException e) {
+        } catch (Exception e) {
             // TODO 鑷姩鐢熸垚 catch 鍧�
             e.printStackTrace();
         }
@@ -2785,7 +2784,7 @@
 
             stringDate = getFomartDate(new Date(now), formate);
 
-        } catch (ParseException e) {
+        } catch (Exception e) {
 
             e.printStackTrace();
         }
@@ -2800,8 +2799,7 @@
             long now = date.getTime() + (long) Integer.parseInt(days) * DAY_IN_MILLISECOND;
 
             date = new Date(now);
-
-        } catch (ParseException e) {
+        } catch (Exception e) {
 
             e.printStackTrace();
         }
@@ -2818,10 +2816,16 @@
      *
      * 瀛楃涓插舰寮忚浆鍖栦负Date绫诲瀷 String绫诲瀷鎸夌収format鏍煎紡杞负Date绫诲瀷
      **/
-    public static Date fromStringToDate(String format, String dateTime) throws ParseException {
+    public static Date fromStringToDate(String format, String dateTime)  {
         Date date = null;
-        SimpleDateFormat sdf = new SimpleDateFormat(format);
-        date = sdf.parse(dateTime);
+        try {
+
+            SimpleDateFormat sdf = new SimpleDateFormat(format);
+            date = sdf.parse(dateTime);
+        }catch (Exception e){
+
+        }
+
         return date;
     }
 
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java b/server/system_service/src/main/java/com/doumee/dao/business/dao/CompanyMapper.java
similarity index 88%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java
rename to server/system_service/src/main/java/com/doumee/dao/business/dao/CompanyMapper.java
index 6ed1e68..9765f4d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/dao/CompanyMapper.java
@@ -1,4 +1,4 @@
-package com.doumee.dao.business;
+package com.doumee.dao.business.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.doumee.dao.business.model.Company;
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/dao/join/CompanyJoinMapper.java b/server/system_service/src/main/java/com/doumee/dao/business/dao/join/CompanyJoinMapper.java
new file mode 100644
index 0000000..44103cd
--- /dev/null
+++ b/server/system_service/src/main/java/com/doumee/dao/business/dao/join/CompanyJoinMapper.java
@@ -0,0 +1,11 @@
+package com.doumee.dao.business.dao.join;
+
+import com.doumee.dao.business.model.Company;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+
+/**
+ * @author T14
+ */
+//@Repository
+public interface CompanyJoinMapper extends MPJJoinMapper<Company> {
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
similarity index 96%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
rename to server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
index b165a47..ccf1673 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -1,15 +1,15 @@
 package com.doumee.dao.business.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.doumee.core.annotation.excel.ExcelColumn;
 import com.doumee.core.model.LoginUserModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
 import java.util.List;
 
@@ -122,7 +122,7 @@
 
     @ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
     @ExcelColumn(name="璐熻矗浜虹紪鐮�")
-    private String headId;
+    private Integer headId;
 
     @ApiModelProperty(value = "ERP鍚屾鏃堕棿")
     @ExcelColumn(name="ERP鍚屾鏃堕棿")
@@ -181,9 +181,12 @@
     @ApiModelProperty(value = "娴峰悍閮ㄩ棬绾у埆璺緞", example = "1")
     @ExcelColumn(name="娴峰悍閮ㄩ棬绾у埆璺緞")
     private String hkCompanyPath;
+    @ApiModelProperty(value = "鑷缓閮ㄩ棬缂栫爜绾у埆璺緞", example = "1")
+    @ExcelColumn(name="鑷缓閮ㄩ棬缂栫爜绾у埆璺緞")
+    private String companyPath;
     @ApiModelProperty(value = "鑷缓閮ㄩ棬绾у埆璺緞", example = "1")
     @ExcelColumn(name="鑷缓閮ㄩ棬绾у埆璺緞")
-    private String companyPath;
+    private String companyNamePath;
     @ApiModelProperty(value = "鐖剁骇閮ㄩ棬绾у埆璺緞", example = "1")
     @TableField(exist = false)
     private String parentCompanyPath;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
index 8f88b2b..7b8d088 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
@@ -102,5 +102,10 @@
 
     @ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
     private Integer status;
+    @ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攃ompany锛�")
+    private Integer companyId;
+    @ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
+    @TableField(exist = false)
+    private String companyName;
 
 }
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index 263c9d0..087530c 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -124,13 +124,13 @@
     @Override
     public PageData<SystemUserListVO> findPage(PageWrap<QuerySystemUserDTO> pageWrap) {
         // 鏍归儴闂ㄦ潯浠跺鐞嗭紙闇�鏌ヨ鏍归儴闂ㄤ笅鎵�鏈夐儴闂ㄧ殑鐢ㄦ埛锛�
-        if (pageWrap.getModel().getRootDeptId() != null) {
+    /*    if (pageWrap.getModel().getRootDeptId() != null) {
             pageWrap.getModel().setDepartmentIds(getDeptIds(pageWrap.getModel().getRootDeptId()));
         } else {
             List<SystemDepartment> list = systemDepartmentService.findList(new QueryWrapper<>());
             List<Integer> collect = list.stream().map(s -> s.getId()).collect(Collectors.toList());
             pageWrap.getModel().setDepartmentIds(collect);
-        }
+        }*/
         // 鎵ц鏌ヨ
         PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
         List<SystemUserListVO> userList = systemUserMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause());
diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 78d68d6..269920c 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -5,10 +5,10 @@
   <!-- 鏌ヨ鐢ㄦ埛鍒楄〃 -->
   <resultMap id="SystemUserListVO" type="com.doumee.dao.system.vo.SystemUserListVO" autoMapping="true">
     <id column="ID" property="id"/>
-    <association property="department" javaType="com.doumee.dao.system.model.SystemDepartment">
+ <!--   <association property="department" javaType="com.doumee.dao.system.model.SystemDepartment">
       <result column="DEPARTMENT_ID" property="id"/>
       <result column="DEPARTMENT_NAME" property="name"/>
-    </association>
+    </association>-->
     <association property="createUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
       <result column="CREATE_USER_ID" property="id"/>
       <result column="CREATE_USER_NAME" property="username"/>
@@ -26,14 +26,12 @@
       usr.ID, usr.BIRTHDAY, usr.EMAIL, usr.EMP_NO, usr.MOBILE, usr.AVATAR, usr.USERNAME, usr.REALNAME, usr.SEX, usr.FIXED, usr.CREATE_TIME, usr.UPDATE_TIME,
       sd.ID AS DEPARTMENT_ID, sd.`NAME` AS DEPARTMENT_NAME,usr.wechat_name,usr.status,usr.OPENID,usr.type,
       create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME, create_user.`REALNAME` CREATE_REAL_NAME,
-      update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME, create_user.`REALNAME` UPDATE_REAL_NAME
+      update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME, create_user.`REALNAME` UPDATE_REAL_NAME,
+      sd.name as companyName
     FROM `SYSTEM_USER` usr
     LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = usr.CREATE_USER
     LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = usr.UPDATE_USER
---     LEFT JOIN `SYSTEM_POSITION_USER` spu ON spu.USER_ID = usr.ID AND spu.DELETED = 0
---     LEFT JOIN `SYSTEM_POSITION` sp ON sp.ID = spu.POSITION_ID AND sp.DELETED = 0
-    LEFT JOIN `SYSTEM_DEPARTMENT_USER` sdu ON sdu.USER_ID = usr.ID AND sdu.DELETED = 0
-    LEFT JOIN `SYSTEM_DEPARTMENT` sd ON sd.ID = sdu.DEPARTMENT_ID AND sd.DELETED = 0
+    LEFT JOIN `company` sd ON sd.ID = usr.COMPANY_ID AND sd.ISDELETED = 0
     <if test="dto.roleId != null">
       RIGHT JOIN system_user_role sur on sur.USER_ID = usr.ID and sur.ROLE_ID = #{dto.roleId}
     </if>
@@ -43,10 +41,10 @@
 <!--        AND spu.POSITION_ID = #{dto.positionId}-->
 <!--      </if>-->
       <if test="dto.strictDeptId != null">
-        AND sdu.DEPARTMENT_ID = #{dto.strictDeptId}
+        AND  sd.ID = #{dto.strictDeptId}
       </if>
       <if test="dto.departmentIds != null and dto.departmentIds.size > 0">
-        AND sdu.DEPARTMENT_ID IN
+        AND sd.ID IN
         <foreach collection="dto.departmentIds" open="(" close=")" separator="," item="id">
           #{id}
         </foreach>
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index a565622..7da2af5 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -9,7 +9,6 @@
 import com.doumee.core.utils.Constants;
 import com.doumee.dao.admin.request.LaborMemberDTO;
 import com.doumee.dao.admin.request.MemberQuery;
-import com.doumee.dao.admin.response.MemberInfoDTO;
 import com.doumee.dao.business.model.Member;
 import com.doumee.service.business.ext.ERPSyncService;
 import com.doumee.service.business.MemberService;
@@ -63,7 +62,7 @@
     @GetMapping("/delete/{id}")
     @RequiresPermissions("business:member:delete")
     public ApiResponse deleteById(@PathVariable Integer id) {
-        memberService.deleteById(id);
+        memberService.deleteById(id,this.getLoginUser(null));
         return ApiResponse.success(null);
     }
 
@@ -76,7 +75,7 @@
         for (String id : idArray) {
             idList.add(Integer.valueOf(id));
         }
-        memberService.deleteByIdInBatch(idList);
+        memberService.deleteByIdInBatch(idList,this.getLoginUser(null));
         return ApiResponse.success(null);
     }
 
@@ -123,28 +122,6 @@
         return ApiResponse.success(null);
     }
 
-    @ApiOperation("浜哄憳绉婚櫎/瑙ｅ喕")
-    @PostMapping("/updateRemoveStatusById")
-    @RequiresPermissions("business:member:update")
-    public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list){
-        if(list.size()>0){
-            memberService.updateRemoveStatusById(list);
-            return ApiResponse.success(null);
-        }else{
-            return ApiResponse.failed("鍙傛暟閿欒");
-        }
-
-    }
-
-    @ApiOperation("浜哄憳鎷夐粦/鍐荤粨")
-    @PostMapping("/updateVisitsStatusById")
-    @RequiresPermissions("business:member:update")
-    public ApiResponse updateVisitsStatusById(@RequestBody Member member){
-        memberService.updateVisitsStatusById(member);
-        return ApiResponse.success(null);
-    }
-
-
     @ApiOperation("鎵归噺鎷夐粦")
     @GetMapping("/batchBlock")
     @RequiresPermissions("business:member:delete")
@@ -154,7 +131,7 @@
         for (String id : idArray) {
             idList.add(Integer.valueOf(id));
         }
-        memberService.batchBlock(idList,2);
+        memberService.batchBlock(idList,2,this.getLoginUser(null));
         return ApiResponse.success(null);
     }
 
@@ -167,7 +144,7 @@
         for (String id : idArray) {
             idList.add(Integer.valueOf(id));
         }
-        memberService.batchBlock(idList,1);
+        memberService.batchBlock(idList,1,this.getLoginUser(null));
         return ApiResponse.success(null);
     }
 
@@ -188,12 +165,6 @@
         return ApiResponse.success(memberService.findPage(pageWrap));
     }
 
-    @ApiOperation("鍒嗛〉鍔冲姟鐢ㄦ埛淇℃伅鏌ヨ")
-    @PostMapping("/findLaborMemberInfoPage")
-    @RequiresPermissions("business:member:query")
-    public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap){
-        return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap));
-    }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
@@ -221,7 +192,7 @@
     @ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
     @PostMapping("/findMemberInfoPage")
     @RequiresPermissions("business:member:query")
-    public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
+    public ApiResponse<PageData<Member>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
         if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
             return ApiResponse.success(memberService.findVisitPage(pageWrap));
         }else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
@@ -234,7 +205,7 @@
     @ApiOperation("鍒嗛〉鏌ヨ璁垮浜哄憳淇℃伅")
     @PostMapping("/findVisitPage")
     @RequiresPermissions("business:member:query")
-    public ApiResponse<PageData<MemberInfoDTO>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
+    public ApiResponse<PageData<Member>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
         return ApiResponse.success(memberService.findVisitPage(pageWrap));
     }
 
@@ -242,7 +213,7 @@
     @ApiOperation("寮傚父浜哄憳鍐荤粨/鎷夐粦")
     @PostMapping("/findUnusualPage")
     @RequiresPermissions("business:member:query")
-    public ApiResponse<PageData<MemberInfoDTO>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
+    public ApiResponse<PageData<Member>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
         return ApiResponse.success(memberService.findUnusualPage(pageWrap));
     }
 
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
index c5f8ca7..7785c41 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
@@ -58,7 +58,7 @@
     @ApiOperation("鍒涘缓鍔冲姟鍏徃")
     @PostMapping("/createLaborServices")
     @CloudRequiredPermission("business:company:create")
-    public ApiResponse<Integer> createLaborServices(@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+    public ApiResponse<Integer> createLaborServices(@RequestBody Company company, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         company.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(companyService.createLaborServices(company));
     }
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
index 1cdcdd2..6d923d2 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
@@ -11,7 +11,6 @@
 import com.doumee.core.utils.Constants;
 import com.doumee.dao.admin.request.LaborMemberDTO;
 import com.doumee.dao.admin.request.MemberQuery;
-import com.doumee.dao.admin.response.MemberInfoDTO;
 import com.doumee.dao.business.model.Member;
 import com.doumee.service.business.MemberService;
 import com.doumee.service.business.ext.ERPSyncService;
@@ -46,8 +45,15 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @CloudRequiredPermission("business:member:create")
-    public ApiResponse create(@RequestBody Member member) {
-        return ApiResponse.success(memberService.create(member));
+    public ApiResponse create(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self){
+           member.setLoginUserInfo(this.getLoginUser(token));
+           Member insert = memberService.create(member);
+            //鍒涘缓浜鸿劯淇℃伅
+            return ApiResponse.success("鎿嶄綔鎴愬姛锛�");
+        }else{
+            return ApiResponse.failed("瀵逛笉璧凤紝鏃犳潈闄愭搷浣滐紒");
+        }
     }
 
     @PreventRepeat
@@ -62,7 +68,7 @@
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:member:delete")
     public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
-        memberService.deleteById(id);
+        memberService.deleteById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -75,7 +81,7 @@
         for (String id : idArray ){
             idList.add(Integer.valueOf(id));
         }
-        memberService.deleteByIdInBatch(idList);
+        memberService.deleteByIdInBatch(idList,this.getLoginUser(null));
         return ApiResponse.success(null);
     }
 
@@ -110,63 +116,88 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:member:update")
     public ApiResponse updateById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        member.setLoginUserInfo(this.getLoginUser(token));
         memberService.updateById(member);
+        return ApiResponse.success(null);
+    }
+    @ApiOperation("璁剧疆鎴栧彇娑堜富绠�")
+    @PostMapping("/updateHead")
+    @CloudRequiredPermission("business:member:head")
+    public ApiResponse updateHead(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        member.setLoginUserInfo(this.getLoginUser(token));
+        memberService.updateHead(member);
         return ApiResponse.success(null);
     }
 
     @ApiOperation("鏍规嵁ID 绂佸惎鐢�  ")
     @PostMapping("/updateStatusById")
     @CloudRequiredPermission("business:member:update")
-    public ApiResponse updateStatusById(@RequestBody Member member){
+    public ApiResponse updateStatusById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        member.setLoginUserInfo(this.getLoginUser(token));
         memberService.updateStatusById(member);
         return ApiResponse.success(null);
     }
 
-    @ApiOperation("浜哄憳绉婚櫎/瑙ｅ喕")
-    @PostMapping("/updateRemoveStatusById")
+    @ApiOperation("鏍规嵁ID 璁剧疆鍦ㄨ亴銆佺鑱�  ")
+    @PostMapping("/updateWorkStatus")
     @CloudRequiredPermission("business:member:update")
-    public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list){
-        if(list.size()>0){
-            memberService.updateRemoveStatusById(list);
-            return ApiResponse.success(null);
-        }else{
-            return ApiResponse.failed("鍙傛暟閿欒");
-        }
-
-    }
-
-    @ApiOperation("浜哄憳鎷夐粦/鍐荤粨")
-    @PostMapping("/updateVisitsStatusById")
-    @CloudRequiredPermission("business:member:update")
-    public ApiResponse updateVisitsStatusById(@RequestBody Member member){
-        memberService.updateVisitsStatusById(member);
+    public ApiResponse updateWorkStatus(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        member.setLoginUserInfo(this.getLoginUser(token));
+        memberService.updateWorkStatus(member);
         return ApiResponse.success(null);
     }
 
 
+
     @ApiOperation("鎵归噺鎷夐粦")
     @GetMapping("/batchBlock")
-    @CloudRequiredPermission("business:member:delete")
+    @CloudRequiredPermission("business:member:update")
     public ApiResponse batchBlock(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         String [] idArray = ids.split(",");
         List<Integer> idList = new ArrayList<>();
         for (String id : idArray ){
             idList.add(Integer.valueOf(id));
         }
-        memberService.batchBlock(idList,2);
+        memberService.batchBlock(idList,2,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
     @ApiOperation("鎵归噺鍐荤粨")
     @GetMapping("/batchFreeze")
-    @CloudRequiredPermission("business:member:delete")
+    @CloudRequiredPermission("business:member:update")
     public ApiResponse batchFreeze(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         String [] idArray = ids.split(",");
         List<Integer> idList = new ArrayList<>();
         for (String id : idArray ){
             idList.add(Integer.valueOf(id));
         }
-        memberService.batchBlock(idList,1);
+        memberService.batchBlock(idList,1,this.getLoginUser(token));
+        return ApiResponse.success(null);
+    }
+
+    @ApiOperation("鎵归噺绉诲嚭榛戝悕鍗�")
+    @GetMapping("/batchRemoveBlock")
+    @CloudRequiredPermission("business:member:update")
+    public ApiResponse batchCancelBlock(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        String [] idArray = ids.split(",");
+        List<Integer> idList = new ArrayList<>();
+        for (String id : idArray ){
+            idList.add(Integer.valueOf(id));
+        }
+        memberService.batchRemoveBlock(idList,2,this.getLoginUser(token));
+        return ApiResponse.success(null);
+    }
+
+    @ApiOperation("鎵归噺瑙ｉ櫎鍐荤粨")
+    @GetMapping("/batchRemoveFreeze")
+    @CloudRequiredPermission("business:member:update")
+    public ApiResponse batchRemoveFreeze(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        String [] idArray = ids.split(",");
+        List<Integer> idList = new ArrayList<>();
+        for (String id : idArray ){
+            idList.add(Integer.valueOf(id));
+        }
+        memberService.batchRemoveBlock(idList,1,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -175,7 +206,8 @@
     @ApiOperation("鏄惁鍙嫓璁跨姸鎬佷慨鏀�")
     @PostMapping("/updateCanVisitById")
     @CloudRequiredPermission("business:member:update")
-    public ApiResponse updateCanVisitById(@RequestBody Member member){
+    public ApiResponse updateCanVisitById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        member.setLoginUserInfo(this.getLoginUser(token));
         memberService.updateCanVisitById(member);
         return ApiResponse.success(null);
     }
@@ -186,13 +218,13 @@
     public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(memberService.findPage(pageWrap));
     }
-
-    @ApiOperation("鍒嗛〉鍔冲姟鐢ㄦ埛淇℃伅鏌ヨ")
-    @PostMapping("/findLaborMemberInfoPage")
+    @ApiOperation("鏌ヨ鍏ㄩ儴")
+    @PostMapping("/list")
     @CloudRequiredPermission("business:member:query")
-    public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap){
-        return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap));
+    public ApiResponse<List<Member>> findPage (@RequestBody Member model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        return ApiResponse.success(memberService.findList(model));
     }
+
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
@@ -220,7 +252,7 @@
     @ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
     @PostMapping("/findMemberInfoPage")
     @CloudRequiredPermission("business:member:query")
-    public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
+    public ApiResponse<PageData<Member>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
             return ApiResponse.success(memberService.findVisitPage(pageWrap));
         }else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
@@ -233,7 +265,7 @@
     @ApiOperation("鍒嗛〉鏌ヨ璁垮浜哄憳淇℃伅")
     @PostMapping("/findVisitPage")
     @CloudRequiredPermission("business:member:query")
-    public ApiResponse<PageData<MemberInfoDTO>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+    public ApiResponse<PageData<Member>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(memberService.findVisitPage(pageWrap));
     }
 
@@ -241,7 +273,7 @@
     @ApiOperation("寮傚父浜哄憳鍐荤粨/鎷夐粦")
     @PostMapping("/findUnusualPage")
     @CloudRequiredPermission("business:member:query")
-    public ApiResponse<PageData<MemberInfoDTO>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+    public ApiResponse<PageData<Member>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(memberService.findUnusualPage(pageWrap));
     }
 
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 383da4e..659794a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -90,10 +90,7 @@
 	 * @return
 	 */
 	public static String getRootOrg() {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.rootOrg);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, "", null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog("",result,path);
-		return  result;
+		return  startDoPostStringArtemis(HKConstants.InterfacePath.rootOrg,null);
 	}
 
 
@@ -103,10 +100,7 @@
 	 * @return
 	 */
 	public static String editOrg(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.editOrg);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return   startDoPostStringArtemis(HKConstants.InterfacePath.editOrg,body);
 	}
 
 	/**
@@ -115,10 +109,7 @@
 	 * @return
 	 */
 	public static String addBatchOrg(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.addBatchOrg);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.addBatchOrg,body);
 	}
 	/**
 	 * 鍒犻櫎缁勭粐淇℃伅
@@ -126,10 +117,7 @@
 	 * @return
 	 */
 	public static String delOrg(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.delBatchOrg);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.delBatchOrg,body);
 	}
 
 	/**
@@ -138,10 +126,7 @@
 	 * @return
 	 */
 	public static String addUser(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.addUser);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.addUser,body);
 	}
 
 
@@ -151,10 +136,7 @@
 	 * @return
 	 */
 	public static String addBatchUser(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.addBatchUser);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.addBatchUser,body);
 	}
 
 	/**
@@ -163,10 +145,7 @@
 	 * @return
 	 */
 	public static String delBatchUser(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.delBatchUser);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.delBatchUser,body);
 	}
 
 	/**
@@ -175,10 +154,7 @@
 	 * @return
 	 */
 	public static String editUser(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.editUser);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.editUser,body);
 	}
 	/**
 	 *	娣诲姞浜鸿劯淇℃伅
@@ -186,10 +162,7 @@
 	 * @return
 	 */
 	public static String addFace(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.addFace);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.addFace,body);
 	}
 	/**
 	 *	缂栬緫浜鸿劯淇℃伅
@@ -197,10 +170,7 @@
 	 * @return
 	 */
 	public static String editFace(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.editFace);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.editFace,body);
 	}
 	/**
 	 *	鍒犻櫎浜鸿劯淇℃伅
@@ -208,10 +178,7 @@
 	 * @return
 	 */
 	public static String delFace(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.delFace);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.delFace,body);
 	}
 	/**
 	 *	鍏ㄩ噺鑾峰彇杞﹀簱淇℃伅
@@ -219,10 +186,7 @@
 	 * @return
 	 */
 	public static String parkList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.getParkList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.getParkList,body);
 	}
 	/**
 	 *	鏍规嵁杞﹀簱缂栫爜鏌ヨ鍑哄叆鍙ｅ垪琛�
@@ -230,10 +194,7 @@
 	 * @return
 	 */
 	public static String entranceList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.getEntranceList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.getEntranceList,body);
 	}
 	/**
 	 *	杞﹁締棰勭害
@@ -241,10 +202,7 @@
 	 * @return
 	 */
 	public static String parkAddition(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.parkAddition);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.parkAddition,body);
 	}
 	/**
 	 *	杞﹁締鍙栨秷棰勭害
@@ -252,10 +210,7 @@
 	 * @return
 	 */
 	public static String parkDeletion(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.parkDeletion);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.parkDeletion,body);
 	}
 	/**
 	 *	鍥哄畾杞﹁締鍏呭�硷紙鍖呮湡锛�
@@ -263,10 +218,7 @@
 	 * @return
 	 */
 	public static String carChargeAddtion(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.carChargeAddtion);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.carChargeAddtion,body);
 	}
 	/**
 	 *	鍥哄畾杞﹁締鍙栨秷鍖呮湡
@@ -274,10 +226,7 @@
 	 * @return
 	 */
 	public static String carChargeDeletion(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.carChargeDeletion);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.carChargeDeletion,body);
 	}
 
 
@@ -305,7 +254,6 @@
 	 * @return
 	 */
 	public static InputStream getVisitPicture(String body)  throws  Exception{
-
 		Map<String, String> path = getPath(HKConstants.InterfacePath.visitPicture);
 		//鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
 		HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
@@ -360,10 +308,7 @@
 	 * @return
 	 */
 	public static String doorSearch(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.doorSearch);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.doorSearch,body);
 	}
 	/**
 	 *	鑾峰彇闂ㄧ璁惧鍒楄〃
@@ -371,10 +316,7 @@
 	 * @return
 	 */
 	public static String acsDeviceList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.acsDeviceList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceList,body);
 	}
 	/**
 	 *	澧為噺鑾峰彇闂ㄧ璁惧鍒楄〃
@@ -382,10 +324,7 @@
 	 * @return
 	 */
 	public static String acsDeviceTimeRangeList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.acsDeviceList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceList,body);
 	}
 	/**
 	 *	璁垮棰勭害
@@ -393,10 +332,7 @@
 	 * @return
 	 */
 	public static String visitAppiontment(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.visitAppiontment);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.visitAppiontment,body);
 	}
 	/**
 	 *	璁垮鍏嶇櫥璁伴绾�
@@ -404,10 +340,7 @@
 	 * @return
 	 */
 	public static String visitAppiontmentMDJ(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.visitAppiontmentMDJ);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.visitAppiontmentMDJ,body);
 	}
 
 	/**
@@ -416,10 +349,17 @@
 	 * @return
 	 */
 	public static String visitCancel(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.visitCancel);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+		return  startDoPostStringArtemis(HKConstants.InterfacePath.visitCancel,body);
+	}
+
+	public static String startDoPostStringArtemis(String pathStr,String body){
+		Map<String, String> path = getPath(pathStr);
+		Map<String, String> header = new HashMap<>();
+		header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
+		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
 		saveInterfaceLog(body,result,path);
-		return  result;
+		return result;
+
 	}
 	/**
 	 *	绛剧璁垮棰勭害
@@ -427,10 +367,7 @@
 	 * @return
 	 */
 	public static String visitOut(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.visitOut);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.visitOut,body);
 	}
 	/**
 	 *	璁垮鏉冮檺缁�
@@ -438,10 +375,7 @@
 	 * @return
 	 */
 	public static String privilegeGroup(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.privilegeGroup);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.privilegeGroup,body);
 	}
 	/**
 	 *	浜嬩欢璁㈤槄
@@ -449,10 +383,7 @@
 	 * @return
 	 */
 	public static String eventSub(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.eventSub);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.eventSub,body);
 	}
 	/**
 	 *	鍙栨秷浜嬩欢璁㈤槄
@@ -460,10 +391,7 @@
 	 * @return
 	 */
 	public static String cancelEventSub(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.cancelEventSub);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.cancelEventSub,body);
 	}
 	/**
 	 *	鍒涘缓涓�鍗￠�氭潈闄愪笅杞戒换鍔�
@@ -471,10 +399,7 @@
 	 * @return
 	 */
 	public static String taskAddition(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.taskAddition);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.taskAddition,body);
 	}
 	/**
 	 *	鏌ヨ涓�鍗￠�氭潈闄愭煡璇㈣澶囬�氶亾鐨勪汉鍛樻潈闄愪笅杞借鎯呮�绘暟v2
@@ -482,10 +407,7 @@
 	 * @return
 	 */
 	public static String taskProgress(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.taskProgress);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.taskProgress,body);
 	}
 	/**
 	 *	鏌ヨ涓�鍗￠�氭潈闄愪笅杞戒换鍔¤繘搴�
@@ -493,10 +415,7 @@
 	 * @return
 	 */
 	public static String taskProgressNum(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.taskProgressNum);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.taskProgressNum,body);
 	}
 	/**
 	 *	涓�鍗￠�氭潈闄愪笅杞戒换鍔′腑娣诲姞鏁版嵁_鏍规嵁浜哄憳涓庤澶囬�氶亾鎸囧畾涓嬭浇
@@ -504,10 +423,7 @@
 	 * @return
 	 */
 	public static String taskDataAddition(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.taskDataAddition);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.taskDataAddition,body);
 	}
 	/**
 	 *	涓�鍗￠�氬紑濮嬩笅杞戒换鍔�
@@ -515,10 +431,7 @@
 	 * @return
 	 */
 	public static String taskStart(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.taskStart);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.taskStart,body);
 	}
 	/**
 	 * 鏌ヨ鏉冮檺鏉＄洰鍒楄〃
@@ -526,13 +439,7 @@
 	 * @return
 	 */
 	public static String authItemList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.authItemList);
-		Map<String, String> header = new HashMap<>();
-		header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
-//		header.put("tagId", "frs");
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.authItemList,body);
 	}
 	/**
 	 * 鎵归噺寮�鍗�
@@ -540,11 +447,7 @@
 	 * @return
 	 */
 	public static String cardBingding(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.cardBingding);
-		Map<String, String> header = new HashMap<>();
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.cardBingding,body);
 	}
 	/**
 	 * 閫�鍗�
@@ -552,11 +455,7 @@
 	 * @return
 	 */
 	public static String cardDeletion(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.cardDeletion);
-		Map<String, String> header = new HashMap<>();
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.cardDeletion,body);
 	}
 	/**
 	 * 鎵归噺鎸傚け
@@ -564,11 +463,7 @@
 	 * @return
 	 */
 	public static String cardLoss(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.cardLoss);
-		Map<String, String> header = new HashMap<>();
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.cardLoss,body);
 	}
 	/**
 	 * 鎵归噺瑙ｆ寕
@@ -576,11 +471,7 @@
 	 * @return
 	 */
 	public static String cardUnloss(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.cardUnloss);
-		Map<String, String> header = new HashMap<>();
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.cardUnloss,body);
 	}
 	/**
 	 * 鏌ヨ璁惧閫氶亾鐨勪汉鍛樻潈闄愪笅杞借鎯�
@@ -588,11 +479,7 @@
 	 * @return
 	 */
 	public static String taskPersoDetail(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.taskPersoDetail);
-		Map<String, String> header = new HashMap<>();
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.taskPersoDetail,body);
 	}
 
 	/**
@@ -601,10 +488,7 @@
 	 * @return
 	 */
 	public static String visitingRecords(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.visitingRecords);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.visitingRecords,body);
 	}
 
 	/**
@@ -613,10 +497,7 @@
 	 * @return
 	 */
 	public static String appointmentRecords(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.appointmentRecords);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.appointmentRecords,body);
 	}
 	/**
 	 *	鑾峰彇鍏ㄩ噺缁勭粐鍒楄〃
@@ -624,10 +505,7 @@
 	 * @return
 	 */
 	public static String orgAllList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.orgAllList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.orgAllList,body);
 	}
 	/**
 	 *	鑾峰彇鍏ㄩ噺鐢ㄦ埛鍒楄〃
@@ -635,10 +513,7 @@
 	 * @return
 	 */
 	public static String userAllList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.userAllList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.userAllList,body);
 	}
 	/**
 	 *	鑾峰彇鍏ㄩ噺鐢ㄦ埛鍒楄〃2(鏍规嵁鏉′欢鍒嗛〉鏌ヨ锛�
@@ -646,10 +521,7 @@
 	 * @return
 	 */
 	public static String personList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.personList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.personList,body);
 	}
 	/**
 	 *	澧為噺鑾峰彇缁勭粐鍒楄〃
@@ -657,10 +529,7 @@
 	 * @return
 	 */
 	public static String orgTimeRangeList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.orgTimeRangeList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.orgTimeRangeList,body);
 	}
 	/**
 	 *	澧為噺鑾峰彇鐢ㄦ埛鍒楄〃
@@ -668,10 +537,7 @@
 	 * @return
 	 */
 	public static String userTimeRangeList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.userTimeRangeList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.userTimeRangeList,body);
 	}
 	/**
 	 *	澧為噺鑾峰彇杞﹁締鍒楄〃
@@ -679,10 +545,7 @@
 	 * @return
 	 */
 	public static String vehicleTimeRangeList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.vehicleTimeRangeList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.vehicleTimeRangeList,body);
 	}
 	/**
 	 *	鍏ㄩ噺鑾峰彇杞﹁締鍒楄〃
@@ -690,10 +553,7 @@
 	 * @return
 	 */
 	public static String vehicleList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.vehicleList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.vehicleList,body);
 	}
 	/**
 	 *	鍋滆溅鍦鸿繃杞﹁褰曟煡璇�
@@ -701,21 +561,15 @@
 	 * @return
 	 */
 	public static String parkCrossRecords(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.parkCrossRecords);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.parkCrossRecords,body);
 	}
 	/**
-	 *	鍋滆溅鍦鸿繃杞﹁褰曟煡璇�
+	 *	浜鸿劯璇勫垎
 	 * @param body
 	 * @return
 	 */
 	public static String facePictureCheck(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.facePictureCheck);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.facePictureCheck,body);
 	}
 
 	/**
@@ -724,10 +578,7 @@
 	 * @return
 	 */
 	public static String acsDeviceStatus(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.acsDeviceStatus);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceStatus,body);
 	}
 
 	/**
@@ -736,10 +587,7 @@
 	 * @return
 	 */
 	public static String tempCarInRecords(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.tempCarInRecords);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.tempCarInRecords,body);
 	}
 
 }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
index d285e67..07a55a1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
@@ -65,6 +65,8 @@
     @ApiModelProperty(value = "erp鏈烘瀯涓婚敭 ")
     private String erpOrgId;
     @ApiModelProperty(value = "鏈烘瀯涓婚敭 ")
-    private String companyId;
+    private Integer companyId;
 
+    @ApiModelProperty(value = "鏄惁鍖呭惈涓嬬骇缁勭粐鐢ㄦ埛")
+    private Boolean includeChild;
 }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
deleted file mode 100644
index 7d74f1b..0000000
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.doumee.dao.admin.response;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.doumee.core.annotation.excel.ExcelColumn;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author T14
- */
-@Data
-@ApiModel("鍔冲姟浜哄憳淇℃伅琛�")
-public class MemberInfoDTO implements Serializable {
-
-    @ApiModelProperty(value = "涓婚敭")
-    private Integer id;
-
-    @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
-    private Integer creator;
-
-    @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
-    private String creatorName;
-
-    @ApiModelProperty(value = "澶囨敞")
-    private String remark;
-
-    @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)")
-    private Integer companyId;
-
-    @ApiModelProperty(value = "鍏徃鍚嶇О")
-    private String companyName;
-
-    @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺  ", example = "1")
-    private Integer hkStatus;
-
-    @ApiModelProperty(value = "鍏徃璐熻矗浜�")
-    private String linkName;
-
-    @ApiModelProperty(value = "鍏徃璐熻矗浜鸿仈绯荤數璇�")
-    @ExcelColumn(name="鑱旂郴鐢佃瘽")
-    private String linkPhone;
-
-    @ApiModelProperty(value = "浜鸿劯鐓х墖")
-    private String faceImg;
-
-    @ApiModelProperty(value = "鍋ュ悍鐮�")
-    private String imgurl;
-
-    @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹�  2鍐呴儴浜哄憳")
-    private Integer type;
-
-    @ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳鍚嶇О")
-    private String name;
-
-    @ApiModelProperty(value = "鎬у埆")
-    private Integer sex;
-
-    @ApiModelProperty(value = "璁垮骞撮緞")
-    private Date birthday;
-
-    @ApiModelProperty(value = "鎵嬫満鍙�")
-    private String phone;
-
-    @ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
-    private String idcardNo;
-
-    @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
-    private String idcardDecode;
-
-    @ApiModelProperty(value = "宸ュ彿")
-    private String code;
-
-    @ApiModelProperty(value = "鐝")
-    private String classes;
-
-    @ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤 2鎷夐粦/鍐荤粨")
-    private Integer status;
-
-    @ApiModelProperty(value = "娣诲姞浜虹紪鐮侊紙鑷叧鑱旓級")
-    private Integer parentId;
-
-    @ApiModelProperty(value = "寰俊openid")
-    private String openid;
-
-    @ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜")
-    private String roleId;
-
-    @ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О")
-    private String roleName;
-
-    @ApiModelProperty(value = "鏄惁鍙嫓璁夸汉 0鍚� 1鏄�")
-    private String canVisit;
-
-    @ApiModelProperty(value = "鍗＄墖鏁�")
-    private Integer memberCardCount;
-
-    @ApiModelProperty(value = "鍩硅鏈夋晥鏈熺粨鏉熸椂闂�")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date trainTimeEndTime;
-
-    @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熺粨鏉�")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date empowerEndTime;
-
-    @ApiModelProperty(value = "鎷滆娆℃暟")
-    @TableField(exist = false)
-    private Integer visitsCount;
-
-    @ApiModelProperty(value = "鏈�鍚庤瀹㈡椂闂�")
-    @TableField(exist = false)
-    private Date visitsLastDate;
-
-    @ApiModelProperty(value = "鏈�鍚庡喕缁�/鎷夐粦鏃堕棿")
-    @TableField(exist = false)
-    private Date optTime;
-
-    @ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収", example = "1")
-    private Integer idcardType;
-
-    @ApiModelProperty(value = "璁垮鍏徃鍚嶇О")
-    private String visitCompanyName;
-
-    @ApiModelProperty(value = "闂ㄧ缁勫悕绉�")
-    private List<String> roleNames;
-}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
index 8ef6f07..58e60bb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
@@ -4,8 +4,6 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.doumee.dao.admin.response.MemberInfoDTO;
-import com.doumee.dao.business.model.CarEvent;
 import com.doumee.dao.business.model.Member;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -17,17 +15,6 @@
  * @date 2023/11/30 15:33
  */
 public interface MemberMapper extends BaseMapper<Member> {
-
-
-    @Select(" select m.* , c.name as companyName , " +
-            " (select count(0) from member_card mc where mc.MEMBER_ID=m.id and mc.ISDELETED=0) as memberCardCount,  " +
-            " (select GROUP_CONCAT(dr.name) from member_role mr left join device_role dr on dr.id=mr.ROLE_ID  " +
-            " where mr.MEMBER_ID=m.id and mr.ISDELETED=0 GROUP BY mr.MEMBER_ID) as roleName "+
-            " from member m  " +
-            " left join company c on m.COMPANY_ID=c.id "+
-            " ${ew.customSqlSegment} ")
-    IPage<MemberInfoDTO> getPage(IPage<MemberInfoDTO> page, @Param(Constants.WRAPPER) Wrapper wrapper);
-
 
     void insertBatchSomeColumn(List<Member> list);
 }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/CompanyJoinMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/CompanyJoinMapper.java
deleted file mode 100644
index b4fa3e0..0000000
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/CompanyJoinMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.doumee.dao.business.join;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.doumee.dao.business.model.Company;
-import com.github.yulichang.base.mapper.MPJJoinMapper;
-import org.springframework.stereotype.Repository;
-
-/**
- * @author T14
- */
-//@Repository
-public interface CompanyJoinMapper extends MPJJoinMapper<Company> {
-}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index ed6ed39..23ff05f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -20,7 +21,7 @@
 @Data
 @ApiModel("浜哄憳淇℃伅琛�")
 @TableName("`member`")
-public class Member {
+public class Member extends LoginUserModel {
 
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "涓婚敭", example = "1")
@@ -81,7 +82,6 @@
     @ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳")
     @ExcelColumn(name="璁垮鍚嶇О")
     private String name;
-
     @ApiModelProperty(value = "璁垮骞撮緞")
     @ExcelColumn(name="璁垮骞撮緞")
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -94,6 +94,9 @@
     @ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
     @ExcelColumn(name="韬唤璇佸彿锛圡D4鍔犲瘑锛�")
     private String idcardNo;
+    @ApiModelProperty(value = "淇敼鐨勮韩浠借瘉鍙� ")
+    @TableField(exist = false)
+    private String idcardNoNew;
 
     @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
     @ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
@@ -145,12 +148,18 @@
     @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺  ", example = "1")
     @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺")
     private Integer hkStatus;
+    @ApiModelProperty(value = "娴峰悍鎺堟潈鐘舵�� 0鏈巿鏉� 1宸叉巿鏉�   ", example = "1")
+    @ExcelColumn(name="娴峰悍鎺堟潈鐘舵�� 0鏈巿鏉� 1宸叉巿鏉� ")
+    private Integer authStatus;
 
     @ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
     @ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date hkDate;
 
+    @ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴", example = "1")
+    @ExcelColumn(name="鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴")
+    private Integer workStatus;
     @ApiModelProperty(value = "ERP鏍囪瘑", example = "1")
     @ExcelColumn(name="ERP鏍囪瘑")
     private String erpId;
@@ -209,6 +218,21 @@
     @ApiModelProperty(value = "缁勭粐鍚嶇О")
     @TableField(exist = false)
     private String companyName;
+    @ApiModelProperty(value = "鏈�鍚庢搷浣滀汉")
+    @TableField(exist = false)
+    private String editorName;
+    @ApiModelProperty(value = "缁勭粐绫诲瀷")
+    @TableField(exist = false)
+    private Integer companyType;
+    @ApiModelProperty(value = "缁勭粐缂栫爜璺緞")
+    @TableField(exist = false)
+    private String companyPath;
+    @ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
+    @TableField(exist = false)
+    private Integer headId;
+    @ApiModelProperty(value = "缁勭粐璺緞")
+    @TableField(exist = false)
+    private String companyNamePath;
     @ApiModelProperty(value = "缁勭粐娴峰悍缂栫爜")
     @TableField(exist = false)
     private String hkOrgId;
@@ -228,6 +252,8 @@
     @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
     @TableField(exist = false)
     private String keyword;
+
+
 
     @ApiModelProperty(value = "鏄惁鏈変汉鑴革細0=鏃狅紱1=鏈夛紱")
     @TableField(exist = false)
@@ -252,4 +278,22 @@
     @ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�",index= 6,dateFormat = "yyyy-MM-dd")
     private Date endTime;
 
+    @ApiModelProperty(value = "浜鸿劯鐓х墖瀹屾暣鍦板潃")
+    @TableField(exist = false)
+    private String faceImgFull;
+    @ApiModelProperty(value = "浜鸿劯鐓х墖瀹屾暣鍦板潃")
+    @TableField(exist = false)
+    private String imgurlFull;
+    @ApiModelProperty(value = "鏄惁涓荤 0鍚� 1鏄�", example = "1")
+    @TableField(exist = false)
+    private Integer headStatus;
+
+    @ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О")
+    @TableField(exist = false)
+    private String roleName;
+
+    @ApiModelProperty(value = "闂ㄧ缁勫悕绉伴泦鍚�")
+    @TableField(exist = false)
+    private List<String> roleNames;
+
 }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java
index 62e3bf7..4de783f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java
@@ -51,8 +51,8 @@
     @ExcelColumn(name="澶囨敞")
     private String remark;
 
-    @ApiModelProperty(value = "绫诲瀷 0瑙ｅ喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎", example = "1")
-    @ExcelColumn(name="绫诲瀷 0瑙ｅ喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎")
+    @ApiModelProperty(value = "绫诲瀷 0瑙ｅ喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎 10鏇存柊", example = "1")
+    @ExcelColumn(name="绫诲瀷 0瑙ｅ喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎 10鏇存柊")
     private Integer type;
 
     @ApiModelProperty(value = "浜哄憳鎿嶄綔璁板綍鏃ュ織")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
index cc1e70e..18cfe71 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
@@ -6,6 +6,7 @@
 import com.doumee.dao.admin.request.UpdateCompanySortDTO;
 import com.doumee.dao.admin.response.CompanyDTO;
 import com.doumee.dao.business.model.Company;
+
 import java.util.List;
 
 /**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index 4236800..a897572 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -1,11 +1,11 @@
 package com.doumee.service.business;
 
+import com.doumee.core.model.LoginUserInfo;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.dao.admin.request.LaborEmpowerDTO;
 import com.doumee.dao.admin.request.LaborMemberDTO;
 import com.doumee.dao.admin.request.MemberQuery;
-import com.doumee.dao.admin.response.MemberInfoDTO;
 import com.doumee.dao.admin.response.StagingDataVO;
 import com.doumee.dao.business.model.Member;
 import com.doumee.dao.web.reqeust.AccountLoginDTO;
@@ -29,7 +29,7 @@
      * @param member 瀹炰綋瀵硅薄
      * @return Integer
      */
-    Integer create(Member member);
+    Member create(Member member);
 
     /**
      *
@@ -44,7 +44,7 @@
      *
      * @param id 涓婚敭
      */
-    void deleteById(Integer id);
+    void deleteById(Integer id,LoginUserInfo user);
 
     void roleAuthById(Integer id);
 
@@ -60,9 +60,10 @@
      *
      * @param ids 涓婚敭闆�
      */
-    void deleteByIdInBatch(List<Integer> ids);
+    void deleteByIdInBatch(List<Integer> ids,LoginUserInfo user);
 
-    void batchBlock(List<Integer> ids,Integer type);
+    void batchBlock(List<Integer> ids, Integer type, LoginUserInfo loginUserInfo);
+    void batchRemoveBlock(List<Integer> ids, Integer type, LoginUserInfo loginUserInfo);
 
     /**
      * 涓婚敭鏇存柊
@@ -70,8 +71,7 @@
      * @param member 瀹炰綋瀵硅薄
      */
     void updateById(Member member);
-    void updateFace(Member member);
-
+    boolean updateFace(Member member);
 
     /**
      * 涓婚敭鏇存柊鍔冲姟浜哄憳鐘舵��
@@ -80,9 +80,6 @@
      */
     void updateStatusById(Member member);
 
-    void updateVisitsStatusById(Member member);
-
-    void updateRemoveStatusById(List<Member> members);
 
     void updateCanVisitById(Member member);
     /**
@@ -127,14 +124,6 @@
 
 
     /**
-     * 鍒嗛〉鍔冲姟鐢ㄦ埛淇℃伅鏌ヨ
-     *
-     * @param pageWrap 鍒嗛〉瀵硅薄
-     * @return PageData<Member>
-     */
-    PageData<MemberInfoDTO> findLaborMemberInfoPage(PageWrap<MemberInfoDTO> pageWrap);
-
-    /**
      * 鏉′欢缁熻
      *
      * @param member 瀹炰綋瀵硅薄
@@ -157,11 +146,11 @@
      * @param pageWrap
      * @return
      */
-    PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap);
+    PageData<Member> findMemberInfoPage(PageWrap<MemberQuery> pageWrap);
 
-    PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap);
+    PageData<Member> findVisitPage(PageWrap<MemberQuery> pageWrap);
 
-    PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> pageWrap);
+    PageData<Member> findUnusualPage(PageWrap<MemberQuery> pageWrap);
 
     /**
      * 瀹氭椂鍐荤粨鍐呴儴浜哄憳
@@ -207,4 +196,8 @@
     void empowerByList(Member member);
 
     void delHkForce(Member member);
+
+    void updateHead(Member member);
+
+    void updateWorkStatus(Member member);
 }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index 4a8efab..6ad0a41 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -10,7 +10,6 @@
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.admin.request.CarsQuery;
 import com.doumee.dao.admin.response.CarsDTO;
-import com.doumee.dao.admin.response.MemberInfoDTO;
 import com.doumee.dao.business.CarsMapper;
 import com.doumee.dao.business.join.CarJoinMapper;
 import com.doumee.dao.business.join.ParkBookJoinMapper;
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 f1c3d72..73aa6e2 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
@@ -24,15 +24,14 @@
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.admin.request.UpdateCompanySortDTO;
 import com.doumee.dao.admin.response.CompanyDTO;
-import com.doumee.dao.business.CompanyMapper;
 import com.doumee.dao.business.MemberMapper;
-import com.doumee.dao.business.join.CompanyJoinMapper;
-import com.doumee.dao.business.model.Category;
+import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.join.CompanyJoinMapper;
 import com.doumee.dao.business.model.Company;
 import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.vo.CompanyTree;
 import com.doumee.dao.system.model.SystemUser;
 import com.doumee.service.business.CompanyService;
-import com.doumee.dao.business.vo.CompanyTree;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -85,7 +84,8 @@
             user = company.getLoginUserInfo();
         }
         String rootOrgId = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_ROOTORG_CODE).getCode();
-        company.setCompanyPath(company.getName());//鍚嶇О璺緞
+        company.setCompanyPath(company.getId()+"/");//鍚嶇О璺緞
+        company.setCompanyNamePath(company.getName());//鍚嶇О璺緞
         company.setHkParentId(rootOrgId);
         if(company.getParentId() !=null){
             Company parent = findById(company.getParentId());
@@ -96,7 +96,8 @@
                 throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鐖剁骇缁勭粐淇℃伅灏氭湭鍚屾涓嬪彂鎴愬姛~");
             }
             company.setHkParentId(parent.getHkId());
-            company.setCompanyPath(parent.getCompanyPath()+"/"+company.getName());
+            company.setCompanyPath(parent.getCompanyPath()+company.getId()+"/");
+            company.setCompanyNamePath(parent.getCompanyNamePath()+"/"+company.getName());
         }
         company.setHkCompanyPath(company.getCompanyPath());
         company.setCreateDate(new Date());
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 591a1b2..12f2c3e 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
@@ -1,37 +1,21 @@
 package com.doumee.service.business.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
-import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
-import com.doumee.core.haikang.model.param.respose.AcsDeviceInfoResponse;
-import com.doumee.core.haikang.model.param.respose.AcsDeviceListResponse;
-import com.doumee.core.haikang.service.HKService;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.DeviceMapper;
-import com.doumee.dao.business.model.Company;
 import com.doumee.dao.business.model.Device;
-import com.doumee.dao.business.model.Retention;
 import com.doumee.service.business.DeviceService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 璁惧淇℃伅琛⊿ervice瀹炵幇
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
index 63d795a..08af695 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
@@ -3,9 +3,6 @@
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.Date;
-import com.doumee.core.utils.Utils;
-import com.doumee.dao.admin.response.MemberInfoDTO;
 import com.doumee.dao.business.EmpowerMapper;
 import com.doumee.dao.business.join.EmpowerJoinMapper;
 import com.doumee.dao.business.model.Company;
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 72e455e..cba4c22 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
@@ -1,10 +1,12 @@
 package com.doumee.service.business.impl;
 
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.PhoneUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.config.DataSyncConfig;
 import com.doumee.config.Jwt.JwtPayLoad;
@@ -14,43 +16,41 @@
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.haikang.model.HKConstants;
 import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.UserAddRequest;
 import com.doumee.core.haikang.model.param.request.UserDelRequest;
+import com.doumee.core.haikang.model.param.respose.UserAddResponse;
 import com.doumee.core.haikang.model.param.respose.UserDelResponse;
 import com.doumee.core.haikang.service.HKService;
 import com.doumee.core.model.LoginUserInfo;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DESUtil;
-import com.doumee.core.utils.HttpsUtil;
-import com.doumee.core.utils.Utils;
+import com.doumee.core.utils.*;
 import com.doumee.core.utils.redis.RedisUtil;
 import com.doumee.core.wx.WXConstant;
 import com.doumee.dao.admin.request.LaborEmpowerDTO;
 import com.doumee.dao.admin.request.LaborMemberDTO;
 import com.doumee.dao.admin.request.MemberQuery;
-import com.doumee.dao.admin.response.MemberInfoDTO;
 import com.doumee.dao.admin.response.StagingDataVO;
 import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.CompanyMapper;
 import com.doumee.dao.business.join.MemberJoinMapper;
 import com.doumee.dao.business.join.RetentionJoinMapper;
 import com.doumee.dao.business.join.UserActionJoinMapper;
 import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.SystemUserMapper;
 import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.dao.system.model.SystemUser;
 import com.doumee.dao.web.reqeust.AccountLoginDTO;
 import com.doumee.dao.web.reqeust.CheckVisitedDTO;
 import com.doumee.dao.web.reqeust.VisitMemberDTO;
 import com.doumee.dao.web.response.MemberVO;
 import com.doumee.dao.web.response.WxAuthorizeVO;
 import com.doumee.service.business.MemberService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
 import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.BeanUtils;
@@ -59,6 +59,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -111,20 +112,315 @@
 
     @Autowired
     private VisitsMapper visitsMapper;
+    @Autowired
+    private SystemUserMapper systemUserMapper;
 
 
     @Override
-    public Integer create(Member member) {
-        memberMapper.insert(member);
-        return member.getId();
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+    public Member create(Member member) {
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(loginUserInfo == null){
+            loginUserInfo = member.getLoginUserInfo();
+        }
+        isMemberParamValid(member);
+        //鑾峰彇鍑虹敓鏃ユ湡
+        //鑴辨晱鎿嶄綔
+        Member insert = initAddMemberModel(member,loginUserInfo);
+        //娴峰悍浜哄憳鏂板涓氬姟
+        if(dealHkUserBiz(insert)){
+            try {
+                memberMapper.insert(insert);
+                //鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛�
+                createSystemUser(insert);
+            }catch (Exception e){
+                //濡傛灉鍙戠敓寮傚父锛屽垹闄ゅ凡缁忓垱寤虹殑浜哄憳淇℃伅
+                deleteHkUserBiz(insert.getHkId());
+                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鏂板缓澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+            }
+        }else{
+            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+        }
+        return insert;
+    }
+    private void createSystemUser(Member insert) {
+        SystemUser user = new SystemUser();
+        // 鐢熸垚瀵嗙爜鐩�
+        String salt = RandomStringUtils.randomAlphabetic(6);
+        // 鐢熸垚瀵嗙爜
+        user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INITIAL_PASSWORD).getCode(), salt));
+        user.setSalt(salt);
+
+        // 鍒涘缓鐢ㄦ埛璁板綍
+        user.setType(insert.getType());
+        user.setUsername(insert.getPhone());
+        user.setEmpNo(insert.getCode());
+        user.setRealname(insert.getName());
+        user.setCompanyId(insert.getCompanyId());
+        user.setMobile(insert.getPhone());
+        user.setCreateTime(insert.getCreateDate());
+        user.setCreateUser(insert.getCreator());
+        user.setUpdateUser(insert.getEditor());
+        user.setUpdateTime(insert.getEditDate());
+        user.setMemberId(insert.getId());
+        user.setDeleted(Boolean.FALSE);
+        user.setFixed(Boolean.FALSE);
+        user.setStatus(Constants.ZERO);
+        systemUserMapper.insert(user);
+    }
+
+    private Member initAddMemberModel(Member member, LoginUserInfo loginUserInfo) {
+        Member insert=  new Member();
+        insert.setCreator(loginUserInfo.getId());
+        insert.setCreateDate(new Date());
+        insert.setEditor(loginUserInfo.getId());
+        insert.setEditDate(new Date());
+        insert.setIsdeleted(Constants.ZERO);
+        insert.setCompanyId(member.getCompanyId());
+        insert.setFaceImg(member.getFaceImg());
+        insert.setImgurl(member.getImgurl());
+        insert.setCode(member.getCode());
+        insert.setType(Constants.TWO);
+        insert.setHkDate(new Date());
+        insert.setWorkStatus(Constants.ONE);//榛樿鍦ㄨ亴
+        insert.setCanVisit(Constants.ZERO);//榛樿涓嶅彲璁块棶
+        insert.setAuthStatus(Constants.ZERO);
+        insert.setName(member.getName());
+        insert.setHkStatus(Constants.ONE);
+        insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
+        insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
+        insert.setPhone(member.getPhone());
+        insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//韬唤璇佸彿鍔犲瘑
+        insert.setIdcardDecode( Constants.getTuominStr(member.getIdcardNo()));
+        insert.setStatus(Constants.ZERO);
+        return  insert;
+    }
+
+    /**
+     * 鍒犻櫎娴峰悍浜哄憳淇℃伅
+     * @param hkId
+     */
+    private void deleteHkUserBiz(String hkId) {
+        UserDelRequest request = new UserDelRequest();
+        request.setPersonIds(new String[]{hkId});
+        BaseResponse<List<UserDelResponse>> result =  HKService.delBatchUser(request);
+    }
+
+    /**
+     * 娴峰悍浜哄憳鏂板涓氬姟
+     * @param insert
+     * @return
+     */
+    private boolean dealHkUserBiz(Member insert) {
+        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+                +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+        Company company = companyMapper.selectById(insert.getCompanyId());
+        if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭凡琚垹闄わ紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
+        }
+        if(StringUtils.isBlank(company.getHkId())){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭湭鍚屾瀹夐槻骞冲彴锛岃鍏堝墠寰�銆愮粍缁囩鐞嗐�戣彍鍗曡繘琛岀淮鎶わ紒");
+        }
+        insert.setHkOrgId(company.getHkId());
+        UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(insert,path,Constants.ZERO);
+        if(hkAddRequest == null){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝浜鸿劯鐓х墖鏈夎锛岃灏濊瘯閲嶆柊涓婁紶锛�");
+        }
+        //澶勭悊鏂板鏁版嵁
+        BaseResponse<UserAddResponse> result =  HKService.addUser(hkAddRequest);
+        if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
+            insert.setHkId(hkAddRequest.getPersonId());
+            insert.setFaceId(result.getData().getFaceId());
+            if(StringUtils.isNotBlank(insert.getFaceId())){
+                insert.setFaceStatus(Constants.ONE);
+            }else{
+                insert.setFaceStatus(Constants.ZERO);
+            }
+            return  true;
+        }else  if(result!=null ){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍚屾瀹夐槻骞冲彴澶辫触銆�"+result.getMsg()+"銆戯紝璇疯仈绯荤鐞嗗憳锛�");
+        }
+        return false;
+    }
+    private boolean dealHkUserForUpdateBiz(Member update ) {
+        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+                +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+
+        UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(update,path,Constants.ONE);
+
+        //澶勭悊鏂板鏁版嵁
+        BaseResponse<UserAddResponse> result =  HKService.editUser(hkAddRequest);
+        if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
+            update.setHkStatus(Constants.ONE);//宸插悓姝�
+            update.setRemark("浜哄憳淇℃伅宸插悓姝ユ垚鍔�");
+            if(StringUtils.isNotBlank(update.getFaceImg()) && Constants.equalsInteger(update.getFaceStatus(),Constants.ZERO)){
+                //濡傛灉鏈変汉鑴哥収鐗囷紝澶勭悊浜鸿劯鐓х墖鍚屾
+                String faceid = HkSyncOrgUserToHKServiceImpl.dealMemberFace(update,path);
+                if(StringUtils.isBlank(faceid)){
+                    throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍛樺伐浜鸿劯淇℃伅涓嶅悎鏍硷紝璇锋洿鎹汉鑴哥収鐗囬噸璇曪紒");
+                }else{
+                    update.setFaceId(faceid);
+                    update.setFaceStatus(Constants.ONE);
+                    //濡傛灉浜鸿劯璺熶綘锛岄噸鏂颁笅鍙戞潈闄愭暟鎹�
+                    update.setRemark("浜哄憳鍜屼汉鑴镐俊鎭悓姝ユ垚鍔�"+result.getMsg());
+                    //閲嶆柊鎺堟潈璁惧鏉冮檺
+//                    HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,update,deviceRoleMapper,empowerMapper,deviceMapper);
+                }
+            }
+            update.setHkDate(update.getEditDate());
+            return  true;
+        }else  if(result!=null ){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍚屾瀹夐槻骞冲彴澶辫触銆�"+result.getMsg()+"銆戯紝璇疯仈绯荤鐞嗗憳锛�");
+        }
+        return false;
+    }
+
+    /**
+     * 娓呴櫎鍛樺伐鐨勮澶囨潈闄�
+     * @param member
+     */
+    private void cancelAllMemberEmpower(Member member) {
+        //鍒犻櫎鍏ㄩ儴鏉冮檺
+        memberRoleMapper.update(null,new UpdateWrapper<MemberRole>().lambda()
+                .eq(MemberRole::getMemberId,member.getId())
+                .set(MemberRole::getIsdeleted,Constants.ONE)
+                .set(MemberRole::getEdirot,member.getEditor())
+                .set(MemberRole::getEditDate,member.getEditDate()));
+        //鎶婃墍鏈夊緟涓嬪彂鐨勪换鍔℃敼鎴� 宸插彇娑�
+        empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+                .eq(Empower::getMemberId,member.getId())
+                .eq(Empower::getIsdeleted,Constants.ZERO)
+                .eq(Empower::getSendStatus,Constants.EmpowerStatus.wait)
+                .set(Empower::getIsdeleted,Constants.ONE)
+                .set(Empower::getSendStatus,Constants.EmpowerStatus.cancel));
+        //鎵�鏈変笅鍙戣繃鐨勪换鍔★紝鏀逛负寰呭垹闄ゆ潈闄�
+        empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+                .eq(Empower::getMemberId,member.getId())
+                .set(Empower::getIsdeleted,Constants.ONE)
+                .notIn(Empower::getSendStatus,Constants.EmpowerStatus.fail)
+                .set(Empower::getRemark,"绛夊緟鍚屾鍒犻櫎瀹夐槻骞冲彴")
+                .eq(Empower::getIsdeleted,Constants.ZERO)
+                .eq(Empower::getIsdeleted,Constants.ZERO)
+                .set(Empower::getSendStatus,Constants.ZERO));
+    }
+
+    private void isMemberParamValid(Member member) {
+        if (StringUtils.isBlank(member.getPhone())||!PhoneUtil.isPhone(member.getPhone())){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢佃瘽鍙风爜鏍煎紡鏈夎");
+        }
+        if (StringUtils.isBlank(member.getIdcardNo())||!IdcardUtil.isValidCard(member.getIdcardNo())){
+            if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
+                    .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
+                    .eq(Member::getIsdeleted,Constants.ZERO)
+                    .ne(Member::getId,member.getId())) >0){
+                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNo()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+            }
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鏍煎紡鏈夎");
+        }
+
+        SystemUser queryUserDto = new SystemUser();
+        queryUserDto.setUsername(member.getPhone());
+        queryUserDto.setDeleted(Boolean.FALSE);
+        SystemUser user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1"));
+        if (user != null) {
+            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+queryUserDto.getUsername()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+        }
+        // 楠岃瘉宸ュ彿
+        if (StringUtils.isNotBlank(member.getCode())) {
+            queryUserDto = new SystemUser();
+            queryUserDto.setDeleted(Boolean.FALSE);
+            queryUserDto.setEmpNo(member.getCode());
+            user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1"));
+            if (user != null) {
+                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿銆�"+member.getCode()+"銆戝凡瀛樺湪");
+            }
+        }
+    }
+    private Member isMemberUpdateParamValid(Member member) {
+        Member model = memberMapper.selectById(member.getId());
+        if(model ==null ||Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ュ憳宸ヤ俊鎭笉瀛樺湪锛岃鍒锋柊椤甸潰閲嶈瘯锛�");
+        }
+        if (StringUtils.isNotBlank(member.getPhone()) && !PhoneUtil.isPhone(member.getPhone())){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢佃瘽鍙风爜鏍煎紡鏈夎");
+        }
+        if (StringUtils.isNotBlank(member.getIdcardNoNew())){
+            String encrptNo = (DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNoNew()));//韬唤璇佸彿鍔犲瘑
+            if(  !StringUtils.equals(model.getIdcardNo(),encrptNo)&& !IdcardUtil.isValidCard(member.getIdcardNoNew())){
+                //濡傛灉鍙戠敓鏀瑰彉锛屽苟涓斾笉鍚堟硶锛屾彁绀哄紓甯�
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"淇敼鐨勬柊韬唤璇佸彿鏍煎紡鏈夎");
+            }
+            if( !StringUtils.equals(model.getIdcardNo(),encrptNo) ){
+                if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
+                        .eq(Member::getIdcardNo,encrptNo)
+                        .eq(Member::getIsdeleted,Constants.ZERO)
+                        .ne(Member::getId,member.getId())) >0){
+                    throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNoNew()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+                }
+
+                member.setSex(Constants.getSexByCardNo( member.getIdcardNoNew()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
+                member.setIdcardDecode( Constants.getTuominStr(member.getIdcardNoNew()));
+                member.setIdcardNo(encrptNo);
+            }
+        }
+        boolean isNeedUpdateUser = false;
+        if(StringUtils.isNotBlank(member.getPhone()) && StringUtils.equals(member.getPhone(),model.getPhone())){
+            //  濡傛灉鎵嬫満鍙峰彂鐢熶慨鏀癸紝鏍￠獙鍞竴鎬�
+            SystemUser queryUserDto = new SystemUser();
+            queryUserDto.setUsername(member.getPhone());
+            queryUserDto.setDeleted(Boolean.FALSE);
+            SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>(queryUserDto).lambda()
+                    .ne(SystemUser::getMemberId,model.getId()).last("limit 1"));
+            if (user != null) {
+                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��" + queryUserDto.getUsername() + "銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+            }
+            isNeedUpdateUser = true;
+        }
+        if(StringUtils.isNotBlank(member.getCode()) && StringUtils.equals(member.getPhone(),model.getCode())){
+                // 楠岃瘉宸ュ彿
+            SystemUser queryUserDto = new SystemUser();
+            queryUserDto = new SystemUser();
+            queryUserDto.setDeleted(Boolean.FALSE);
+            queryUserDto.setEmpNo(member.getCode());
+            SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>(queryUserDto).lambda()
+                    .ne(SystemUser::getMemberId,model.getId()).last("limit 1"));
+            if (user != null) {
+                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿銆�"+member.getCode()+"銆戝凡瀛樺湪");
+            }
+            isNeedUpdateUser = true;
+        }
+        if(member.getCompanyId()!=null && !Constants.equalsInteger(member.getCompanyId(),model.getCompanyId())){
+            //濡傛灉缁勭粐鍙戠敓鍙樺寲
+            Company company = companyMapper.selectById(member.getCompanyId());
+            if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
+                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭凡琚垹闄わ紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
+            }
+            if(StringUtils.isBlank(company.getHkId())){
+                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭湭鍚屾瀹夐槻骞冲彴锛岃鍏堝墠寰�銆愮粍缁囩鐞嗐�戣彍鍗曡繘琛岀淮鎶わ紒");
+            }
+            member.setHkOrgId(company.getHkId());
+            isNeedUpdateUser = true;
+        }
+        if(isNeedUpdateUser){
+            //鏇存柊绯荤粺鐢ㄦ埛璐﹀彿淇℃伅
+            systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
+                            .set(SystemUser::getUpdateUser,member.getLoginUserInfo().getId())
+                            .set(SystemUser::getUpdateTime,new Date())
+                            .set(StringUtils.isNotBlank(model.getPhone()),SystemUser::getMobile,member.getPhone())
+                            .set(StringUtils.isNotBlank(model.getName()),SystemUser::getRealname,member.getName())
+                            .set(model.getCompanyId() !=null,SystemUser::getCompanyId,member.getCompanyId())
+                            .set(StringUtils.isNotBlank(model.getCode()),SystemUser::getEmpNo,member.getCode())
+                    .eq(SystemUser::getMemberId,model.getId()));
+        }
+        member.setHkId(model.getHkId());
+        member.setFaceId(model.getFaceId());//浜鸿劯缂栫爜
+        return model;
     }
 
     @Transactional
     @Override
     public Integer laborMemberCreate(LaborMemberDTO member) {
-
         LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
         if (PhoneUtil.isPhone(member.getPhone())){
             throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢佃瘽鍙风爜鏍煎紡鏈夎");
         }
@@ -139,8 +435,6 @@
         //鑴辨晱鎿嶄綔
         String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14);
         //杞崲鏃ユ湡
-        DateTime yyyyMMdd = DateUtil.parse(birthByIdCard, "yyyyMMdd");
-
         Member insert = new Member();
         insert.setCreator(loginUserInfo.getId());
         insert.setCreateDate(new Date());
@@ -152,7 +446,7 @@
         insert.setImgurl(member.getImgurl());
         insert.setType(Constants.ZERO);
         insert.setName(member.getName());
-        insert.setBirthday(yyyyMMdd);
+        insert.setBirthday(DateUtil.fromStringToDate("yyyyMMdd",birthByIdCard));
         insert.setPhone(member.getPhone());
         insert.setIdcardNo(Utils.Secure.encryptString(member.getIdcardNo()));
         IdcardUtil.isValidCard(member.getIdcardNo());
@@ -177,7 +471,7 @@
     }
 
     @Override
-    public void deleteById(Integer id) {
+    public void deleteById(Integer id,LoginUserInfo user) {
         LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
 
         Member member=new Member();
@@ -185,7 +479,10 @@
         member.setIsdeleted(Constants.ZERO);
         member.setEditor(loginUserInfo.getId());
         member.setEditDate(new Date());
+        member.setHkStatus(Constants.ZERO);
+        member.setRemark("浜哄憳宸插垹闄わ紝绛夊緟鍒犻櫎闂ㄧ鏉冮檺");
         memberMapper.updateById(member);
+        saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper);
     }
 
 
@@ -220,83 +517,153 @@
     }
 
     @Override
-    public void deleteByIdInBatch(List<Integer> ids) {
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+    public void deleteByIdInBatch(List<Integer> ids,LoginUserInfo loginUserInfo) {
         if (CollectionUtils.isEmpty(ids)) {
             return;
         }
-        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         Member member=new Member();
         ids.stream().forEach(s ->{
             member.setId(s);
             member.setIsdeleted(Constants.ONE);
+            member.setHkStatus(Constants.ZERO);
+            member.setRemark("浜哄憳宸插垹闄わ紝绛夊緟鍒犻櫎闂ㄧ鏉冮檺");
             member.setEditor(loginUserInfo.getId());
             member.setEditDate(new Date());
             memberMapper.updateById(member);
-
-            UserAction userAction=new UserAction();
-            userAction.setIsdeleted(Constants.ZERO);
-            userAction.setCreateDate(new Date());
-            userAction.setCreator(loginUserInfo.getId());
-            userAction.setType(9);
-            userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬垹闄ゃ��");
-            userAction.setMemberId(s+"");
-            userActionJoinMapper.insert(userAction);
-
+            saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper);
         });
 
-
-
-
-
-      /*  memberMapper.deleteBatchIds(ids);*/
     }
 
+    /**
+     * 鎷夐粦鎴栬�呭喕缁撳憳宸ヤ俊鎭�
+     * @param ids
+     * @param type
+     * @param loginUserInfo
+     */
     @Override
-    public void batchBlock(List<Integer> ids,Integer type) {
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+    public void batchBlock(List<Integer> ids,Integer type,LoginUserInfo loginUserInfo) {
         if (CollectionUtils.isEmpty(ids)) {
             return;
         }
-        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-        Member member=new Member();
         for (Integer id:ids) {
-            member = memberMapper.selectById(id);
+            Member member = memberMapper.selectById(id);
             if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
-                UserAction userAction=new UserAction();
-//                userAction.setBeforeStatus(member.getStatus());
                 member.setStatus(Constants.TWO);
                 member.setEditor(loginUserInfo.getId());
                 member.setEditDate(new Date());
+                member.setAuthStatus(Constants.ZERO);//鏈巿鏉�
                 memberMapper.updateById(member);
+                Date date = new Date();
+                member.setEditDate(date);
+                member.setEditor(loginUserInfo.getId());
+                //鍒犻櫎鍛樺伐闂ㄧ鏉冮檺
+                cancelAllMemberEmpower(member);
 
-                userAction.setIsdeleted(Constants.ZERO);
-                userAction.setCreateDate(new Date());
-                userAction.setCreator(loginUserInfo.getId());
                 if(Constants.equalsInteger(type,Constants.ONE)){
-                    userAction.setType(Constants.ONE);
-                    userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬喕缁撱��");
+                    saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.FREEZE,userActionJoinMapper);
                 }
                 if(Constants.equalsInteger(type,Constants.TWO)){
-                    userAction.setType(Constants.TWO);
-                    userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愭媺榛戙��");
-
+                    saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.BLACKLIST,userActionJoinMapper);
                 }
-                userAction.setMemberId(id+"");
-
-                userActionJoinMapper.insert(userAction);
             }
         }
-        /*  memberMapper.deleteBatchIds(ids);*/
+    }
+    /**
+     * 鎷夐粦鎴栬�呭喕缁撳憳宸ヤ俊鎭�
+     * @param ids
+     * @param type
+     * @param loginUserInfo
+     */
+    @Override
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+    public void batchRemoveBlock(List<Integer> ids,Integer type,LoginUserInfo loginUserInfo) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return;
+        }
+        for (Integer id:ids) {
+            Member member = memberMapper.selectById(id);
+            if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
+                member.setStatus(Constants.ONE);//鎭㈠姝ｅ父鐘舵��
+                member.setEditor(loginUserInfo.getId());
+                member.setEditDate(new Date());
+                member.setAuthStatus(Constants.ZERO);//鏈巿鏉�
+                memberMapper.updateById(member);
+                Date date = new Date();
+                member.setEditDate(date);
+                member.setEditor(loginUserInfo.getId());
+                if(Constants.equalsInteger(type,Constants.ONE)){
+                    saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.CANCEL_FREEZE,userActionJoinMapper);
+                }
+                if(Constants.equalsInteger(type,Constants.TWO)){
+                    saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.CANCEL_BLACKLIST,userActionJoinMapper);
+                }
+            }
+        }
     }
 
 
 
 
     @Override
-    public void updateById(Member member) {
-        memberMapper.updateById(member);
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+    public void updateById(Member updateMember) {
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(loginUserInfo == null){
+            loginUserInfo = updateMember.getLoginUserInfo();
+        }
+        //鏍￠獙鍙傛暟 骞朵笖鏇存柊systemuser 鎵嬫満鍙峰拰宸ュ彿淇℃伅锛堝鏋滈渶瑕佷慨鏀圭殑璇濓級
+         Member model =   isMemberUpdateParamValid(updateMember);
+        updateMember.setEditor(loginUserInfo.getId());
+        updateMember.setEditDate(new Date());
+        //娴峰悍浜哄憳鏂板涓氬姟
+        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(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.getIdcardNo()),Member::getIdcardNo,updateMember.getIdcardNo())
+                    .set(StringUtils.isNotBlank(updateMember.getIdcardDecode()),Member::getIdcardDecode,updateMember.getIdcardDecode())
+                    .set(updateMember.getAuthStatus()!=null,Member::getAuthStatus,updateMember.getAuthStatus())
+                    .set(updateMember.getHkStatus()!=null,Member::getHkStatus,updateMember.getHkStatus())
+                    .set(updateMember.getSex()!=null,Member::getSex,updateMember.getSex())
+                    .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(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
+                    .eq(Member::getId,updateMember.getId()));
+            cancelAllMemberEmpower(updateMember);
+            //璁板綍鎿嶄綔鏃ュ織
+            saveUserActionBiz(updateMember,loginUserInfo,Constants.UserActionType.EDIT,userActionJoinMapper);
+        }else{
+            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+        }
     }
+
+    private void saveUserActionBiz(Member updateMember,LoginUserInfo user, Constants.UserActionType type,UserActionJoinMapper userActionMapper) {
+        UserAction userAction=new UserAction();
+        userAction.setIsdeleted(Constants.ZERO);
+        userAction.setCreateDate(updateMember.getEditDate());
+        userAction.setCreator(updateMember.getEditor());
+        userAction.setType(type.getKey());
+        String info = type.getInfo();
+        userAction.setRemark(info.replace("${param1}",user!=null?user.getRealname():"").replace("${param2}", com.doumee.core.utils.DateUtil.getPlusTime2(updateMember.getEditDate())));
+        userAction.setMemberId(updateMember.getId()+"");
+        userActionMapper.insert(userAction);
+    }
+
     @Override
-    public void updateFace(Member member) {
+    public boolean updateFace(Member member) {
         QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
         wrapper.lambda().ne(Member::getRemark,"浜鸿劯宸插悓姝ユ渶鏂�");
         List<Member> list =memberMapper.selectList(wrapper);
@@ -312,9 +679,11 @@
                  update.setRemark("浜鸿劯宸插悓姝ユ渶鏂�");
                  update.setFaceStatus(Constants.ONE);
                  memberMapper.updateById(update);
+                 return true;
              }
            }
        }
+       return false;
     }
     @Override
     public void delHkForce(Member member) {
@@ -333,95 +702,95 @@
        }
         HkSyncEmpowerServiceImpl.doHkDeleteUser(model.getId(),model.getHkId(),new Date(),memberMapper,memberCardMapper);
     }
+    @Override
+    public void updateHead(Member member) {
+        Member model  =memberMapper.selectById(member.getId());
+        if(model ==null) {
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
+        }
+       if(model.getCompanyId()!=null) {
+           if(Constants.equalsObject(member.getHeadStatus(),Constants.ONE)){
+               //濡傛灉鏄彇娑堜富绠�
+               companyMapper.update(null,new UpdateWrapper<Company>().lambda()
+                       .eq(Company::getId,model.getCompanyId())
+                       .set(Company::getHeadId,member.getId()));
+           }else{
+               //濡傛灉鏄涓轰富绠�
+               companyMapper.update(null,new UpdateWrapper<Company>().lambda()
+                       .eq(Company::getId,model.getCompanyId())
+                       .set(Company::getHeadId,null)
+               );
+           }
+       }
+    }
 
     @Override
     public void updateStatusById(Member member) {
+        Member model  =memberMapper.selectById(member.getId());
+        if(model ==null) {
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
+        }
         LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(loginUserInfo == null){
+            loginUserInfo = member.getLoginUserInfo();
+        }
         Member update = new Member();
         update.setEditDate(new Date());
         update.setEditor(loginUserInfo.getId());
         update.setStatus(member.getStatus());
         memberMapper.updateById(update);
     }
-
-
     @Override
-    public void updateVisitsStatusById(Member member) {
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+    public void updateWorkStatus(Member member) {
+        Member model  =memberMapper.selectById(member.getId());
+        if(model ==null) {
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
+        }
         LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-        Member result=memberMapper.selectById(member.getId());
-        Integer status=result.getStatus();
+        if(loginUserInfo == null){
+            loginUserInfo = member.getLoginUserInfo();
+        }
         Member update = new Member();
+        update.setId(member.getId());
         update.setEditDate(new Date());
         update.setEditor(loginUserInfo.getId());
-        update.setStatus(Constants.Status.FREEZE.getValue());
-        update.setId(member.getId());
+        update.setWorkStatus(Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)?Constants.ONE:Constants.ZERO);
+        if(Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)){
+            //濡傛灉鏄鑱�
+            cancelAllMemberEmpower(update);
+        }
+        update.setAuthStatus(Constants.ZERO);
         memberMapper.updateById(update);
-
-        UserAction userAction=new UserAction();
-        userAction.setIsdeleted(Constants.ZERO);
-        userAction.setCreateDate(new Date());
-        userAction.setCreator(loginUserInfo.getId());
-        if(Constants.equalsInteger(result.getType(),Constants.TWO)){
-            userAction.setType(Constants.ONE);
-            userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬喕缁撱��");
-        }
-        if(Constants.equalsInteger(result.getType(),Constants.ZERO)){
-            userAction.setType(Constants.TWO);
-            userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愭媺榛戙��");
-
-        }
-        userAction.setMemberId(result.getId()+"");
-        userAction.setBeforeStatus(status);
-        userActionJoinMapper.insert(userAction);
-    }
-
-
-    @Override
-    public void updateRemoveStatusById(List<Member> members) {
-        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
-        Date date=new Date();
-        members.stream().forEach(s ->{
-            Member result=memberMapper.selectById(s.getId());
-            Integer status=result.getStatus();
-            Member update = new Member();
-            update.setEditDate(date);
-            update.setEditor(loginUserInfo.getId());
-            update.setStatus(Constants.Status.ENABLE.getValue());
-            update.setId(s.getId());
-            memberMapper.updateById(update);
-
-            //瑙ｅ喕涓氬姟 澶勭悊鐢ㄦ埛鎺堟潈瀵煎叆璁板綍
-            this.thawMember(result);
-
-            UserAction userAction=new UserAction();
-            userAction.setIsdeleted(Constants.ZERO);
-            userAction.setCreateDate(new Date());
-            userAction.setCreator(loginUserInfo.getId());
-            if(Constants.equalsInteger(result.getType(),Constants.TWO)){
-                userAction.setType(Constants.ZERO);
-                userAction.setBeforeStatus(Constants.ONE);
-            }
-            if(Constants.equalsInteger(result.getType(),Constants.ONE)){
-                userAction.setBeforeStatus(status);
-                userAction.setType(Constants.TWO);
-            }
-            userAction.setMemberId(result.getId()+"");
-            userActionJoinMapper.insert(userAction);
-        });
+        //璁板綍鎿嶄綔鏃ュ織
+        saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)?Constants.UserActionType.WORK_OFF:Constants.UserActionType.WORK_ON,userActionJoinMapper);
     }
 
 
 
-
     @Override
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
     public void updateCanVisitById(Member member) {
         LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(loginUserInfo == null){
+            loginUserInfo = member.getLoginUserInfo();
+        }
+        Member model  =memberMapper.selectById(member.getId());
+        if(model ==null) {
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
+        }
+        if(Constants.equalsInteger(member.getCanVisit(),model.getCanVisit())){
+            //濡傛灉娌℃湁鍙戠敓鍙樺寲锛岀洿鎺ヨ繑鍥�
+            return;
+        }
         Member update = new Member();
         update.setEditDate(new Date());
+        update.setId(member.getId());
         update.setEditor(loginUserInfo.getId());
         update.setCanVisit(member.getCanVisit());
         memberMapper.updateById(update);
+        //璁板綍鎿嶄綔鏃ュ織
+        saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getCanVisit(),Constants.ONE)?Constants.UserActionType.CANVISIT:Constants.UserActionType.CANCEL_VISIT,userActionJoinMapper);
     }
 
     @Override
@@ -450,8 +819,7 @@
         MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
         queryWrapper.selectAll(Member.class)
-                .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
-                .selectAs(Company::getLinkName,MemberInfoDTO::getLinkName);
+                .selectAs(Company::getName,Member::getCompanyName) ;
 
         if(null != member.getType()) {
             queryWrapper.eq(Member::getType,member.getType());
@@ -460,7 +828,6 @@
             queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
         }
         queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
-
         List<Member> list =  memberJoinMapper.selectJoinList(Member.class,queryWrapper);
         if(list!=null){
             for(Member m : list){
@@ -630,36 +997,6 @@
     }
 
     @Override
-    public PageData<MemberInfoDTO> findLaborMemberInfoPage(PageWrap<MemberInfoDTO> pageWrap) {
-        IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
-        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
-        MemberInfoDTO model = pageWrap.getModel();
-        Utils.MP.blankToNull(model);
-        Date end =pageWrap.getModel().getTrainTimeEndTime() !=null? Utils.Date.getEnd(pageWrap.getModel().getTrainTimeEndTime()):new Date();
-        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
-              /*  .leftJoin(TrainTime.class,TrainTime::getMemberId,Member::getId)
-                .leftJoin(Empower.class,Empower::getMemberId,Member::getId);*/
-
-        queryWrapper.selectAll(Member.class)
-                    .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
-                    .selectAs(Company::getLinkName,MemberInfoDTO::getLinkName)
-                /*.select(" (select Max(tt.END_TIME) from train_time tt where tt.ISDELETED=0 and tt.MEMBER_ID=t.id) as trainTimeEndTime")*/
-                .select(" (select Max(e.END_TIME) from empower e where e.ISDELETED=0 and e.MEMBER_ID=t.id) as empowerEndTime");
-
-        queryWrapper.eq(Member::getType,Constants.ZERO);
-        queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
-                    .like(StringUtils.isNotBlank(model.getName()),Member::getName,model.getName())
-                    .like(StringUtils.isNotBlank(model.getPhone()),Member::getPhone,model.getPhone())
-                    .like(StringUtils.isNotBlank(model.getIdcardDecode()),Member::getIdcardDecode,model.getIdcardDecode())
-                    .having(pageWrap.getModel().getTrainTimeEndTime()!=null,"trainTimeEndTime < "+ DateUtil.format(end,"yyyy-MM-dd HH:mm:ss"));
-        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
-        if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
-            memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode())));
-        }
-        return PageData.from(memberIPage);
-    }
-
-    @Override
     public long count(Member member) {
         QueryWrapper<Member> wrapper = new QueryWrapper<Member>(member);
         wrapper.lambda().like(StringUtils.isNotBlank(member.getRoleIdParam()), Member::getRoleId, member.getRoleIdParam());
@@ -684,14 +1021,22 @@
     }
 
     @Override
-    public PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
+    public PageData<Member> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
         IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
         MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
 
         queryWrapper.selectAll(Member.class);
         queryWrapper.selectAs(Company::getName,Member::getCompanyName);
+        queryWrapper.selectAs(SystemUser::getRealname,Member::getEditorName);
+        queryWrapper.selectAs(Company::getType,Member::getCompanyType);
+        queryWrapper.selectAs(Company::getHeadId,Member::getHeadId);
+        queryWrapper.selectAs(Company::getCompanyNamePath,Member::getCompanyNamePath);
+        queryWrapper.selectAs(Company::getCompanyPath,Member::getCompanyPath);
         queryWrapper.select(" ( select count(1) from member_card mc where mc.isdeleted = 0 and  mc.member_id = t.id ) as  memberCardCount ");
+        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Member::getEditor);
         queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+        queryWrapper.eq(Member::getType,pageWrap.getModel().getType());
+//        queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
         queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,
                         Member::getCompanyId,pageWrap.getModel().getCompanyIds())
                 .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyword()),ms->ms
@@ -707,16 +1052,26 @@
                 .eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted())
                 .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
 //                .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
-                .eq(Member::getType,Constants.memberType.internal)
+//                .eq(Member::getType,Constants.memberType.internal)
                 .eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
                 .orderByDesc(!Constants.equalsObject(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getCreateDate)
                 .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate);
         if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
             queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
         }else{
-            queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
+//            queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
         }
-        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+        if(pageWrap.getModel().getCompanyId()!=null){
+            if(pageWrap.getModel().getIncludeChild()!=null &&pageWrap.getModel().getIncludeChild() ){
+                //濡傛灉鍖呭惈涓嬬骇缁勭粐
+                Company company = companyMapper.selectById(pageWrap.getModel().getCompanyId());//鏌ヨ缁勭粐淇℃伅
+                queryWrapper.likeRight(Company::getCompanyPath,company.getCompanyPath());
+            }else{
+                //涓嶅寘鍚笅绾х粍缁�
+                queryWrapper.eq(Company::getId,pageWrap.getModel().getCompanyId());
+            }
+        }
+        IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
 
         if(CollectionUtils.isNotEmpty(memberIPage.getRecords())){
             //FTP鏂囦欢璁块棶鍓嶇紑
@@ -726,15 +1081,18 @@
             List<DeviceRole> deviceRoleList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
                             .select(DeviceRole::getId,DeviceRole::getName)
                     .eq(DeviceRole::getIsdeleted,Constants.ZERO));
-            for (MemberInfoDTO memberInfoDTO:memberIPage.getRecords()) {
+            for (Member memberInfoDTO:memberIPage.getRecords()) {
                 //鑾峰緱闂ㄧ缁勫悕绉版暟缁�
+                memberInfoDTO.setCanVisit(Constants.formatIntegerNum(memberInfoDTO.getCanVisit()));
+                memberInfoDTO.setWorkStatus(Constants.formatIntegerNum(memberInfoDTO.getWorkStatus()));
+                memberInfoDTO.setHeadStatus(Constants.equalsInteger(memberInfoDTO.getHeadId(),memberInfoDTO.getId())?Constants.ONE:Constants.ZERO);
                 memberInfoDTO.setRoleNames(this.dealRoleDatas(memberInfoDTO.getRoleId(),deviceRoleList));
                 //鎷兼帴鍓嶇紑
                 if(StringUtils.isNotBlank(memberInfoDTO.getFaceImg())){
-                    memberInfoDTO.setFaceImg(prefixUrl + memberInfoDTO.getFaceImg());
+                    memberInfoDTO.setFaceImgFull(prefixUrl + memberInfoDTO.getFaceImg());
                 }
                 if(StringUtils.isNotBlank(memberInfoDTO.getImgurl())){
-                    memberInfoDTO.setImgurl(prefixUrl + memberInfoDTO.getImgurl());
+                    memberInfoDTO.setImgurlFull(prefixUrl + memberInfoDTO.getImgurl());
                 }
             }
         }
@@ -768,13 +1126,13 @@
     }
 
     @Override
-    public PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap) {
+    public PageData<Member> findVisitPage(PageWrap<MemberQuery> pageWrap) {
         IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
         MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
         queryWrapper.selectAll(Member.class)
-                .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
-                .selectAs(Member::getLastVisitDate,MemberInfoDTO::getVisitsLastDate)
+                .selectAs(Company::getName,Member::getCompanyName)
+                .selectAs(Member::getLastVisitDate,Member::getLastVisitDate)
                 .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status  in (7,8) ) as visitsCount");
         queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Member::getName,pageWrap.getModel().getName())
                 .like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
@@ -791,21 +1149,21 @@
         if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
             queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
         }else{
-            queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
+            queryWrapper.eq((pageWrap.getModel().getCompanyId())!=null,Member::getCompanyId,pageWrap.getModel().getCompanyId());
         }
-        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+        IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
         return PageData.from(memberIPage);
 
     }
 
 
     @Override
-    public PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> pageWrap) {
+    public PageData<Member> findUnusualPage(PageWrap<MemberQuery> pageWrap) {
         IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
         MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
         queryWrapper.selectAll(Member.class)
-                .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
+                .selectAs(Company::getName,Member::getCompanyName)
                 .select(" (select ua.CREATE_DATE from user_action ua where ua.MEMBER_ID=t.id and ua.ISDELETED=0  order by ua.CREATE_DATE desc  limit 1) as optTime")
                 .select(" (select s.REALNAME from user_action uac left join system_user s on uac.CREATOR = s.ID    where uac.MEMBER_ID=t.id and uac.ISDELETED=0 order by uac.CREATE_DATE desc  limit 1) as creatorName")
                 .select(" (select STARTTIME from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 order by CREATE_DATE desc  limit 1) as visitsLastDate")
@@ -820,12 +1178,12 @@
                         .or().like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName()))
                 .like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
                 .eq(Member::getStatus,Constants.Status.FREEZE.getValue())
-                .eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Company::getId,pageWrap.getModel().getCompanyId())
+                .eq((pageWrap.getModel().getCompanyId())!=null,Company::getId,pageWrap.getModel().getCompanyId())
                 .eq(Objects.nonNull(pageWrap.getModel().getCode()),Member::getCode,pageWrap.getModel().getCode())
                 .orderByDesc(Member::getCreateDate);
 
 
-        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+        IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
         return PageData.from(memberIPage);
 
     }
@@ -916,15 +1274,12 @@
            return;
         }
         List<Integer> memberIds = memberList.stream().map(m->m.getId()).collect(Collectors.toList());
-
+        Date date = new Date();
         for (Integer id:memberIds) {
-            UserAction userAction=new UserAction();
-            userAction.setIsdeleted(Constants.ZERO);
-            userAction.setCreateDate(new Date());
-            userAction.setType(1);
-            userAction.setRemark("鐢卞畾鏃朵换鍔′簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬喕缁撱��");
-            userAction.setMemberId(id+"");
-            userActionJoinMapper.insert(userAction);
+            Member updateMember = new Member();
+            updateMember.setId(id);
+            updateMember.setEditDate(date);
+            saveUserActionBiz(updateMember,null,Constants.UserActionType.FREEZE,userActionJoinMapper);
         }
 
 
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java
index 212b187..338441f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java
@@ -3,11 +3,8 @@
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.Utils;
-import com.doumee.dao.admin.response.MemberInfoDTO;
 import com.doumee.dao.business.ParksMapper;
 import com.doumee.dao.business.join.ParksJoinMapper;
-import com.doumee.dao.business.model.Member;
 import com.doumee.dao.business.model.Parks;
 import com.doumee.service.business.ParksService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
index bbbe3e2..0392a44 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
@@ -7,9 +7,9 @@
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.CompanyMapper;
 import com.doumee.dao.business.MemberMapper;
 import com.doumee.dao.business.ProblemLogMapper;
+import com.doumee.dao.business.dao.CompanyMapper;
 import com.doumee.dao.business.join.ProblemLogJoinMapper;
 import com.doumee.dao.business.model.Company;
 import com.doumee.dao.business.model.Member;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
index 0a7c27b..a23d069 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
@@ -3,13 +3,11 @@
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.TrainTimeMapper;
 import com.doumee.dao.business.join.TrainTimeJoinMapper;
 import com.doumee.dao.business.model.Company;
 import com.doumee.dao.business.model.Member;
 import com.doumee.dao.business.model.TrainTime;
-import com.doumee.dao.business.model.Visits;
 import com.doumee.dao.system.model.SystemUser;
 import com.doumee.service.business.TrainTimeService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
index 689fbb9..bace142 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
@@ -2,13 +2,11 @@
 
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.UserActionMapper;
 import com.doumee.dao.business.join.UserActionJoinMapper;
 import com.doumee.dao.business.model.Company;
 import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.ParkBook;
 import com.doumee.dao.business.model.UserAction;
 import com.doumee.dao.system.model.SystemUser;
 import com.doumee.service.business.UserActionService;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 4b0213e..32dfe09 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1,22 +1,16 @@
 package com.doumee.service.business.impl;
 
-import cn.hutool.core.date.DateUnit;
-import cn.hutool.core.util.IdcardUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.erp.ErpConstants;
 import com.doumee.core.erp.ErpTool;
-import com.doumee.core.erp.model.openapi.request.VisitListRequest;
 import com.doumee.core.erp.model.openapi.request.erp.ApproveAddRequest;
 import com.doumee.core.erp.model.openapi.request.erp.UserInfoRequest;
-import com.doumee.core.erp.model.openapi.response.VisitEventListResponse;
 import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.haikang.model.HKTools;
 import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.request.VisitAppointmentCancelRequest;
 import com.doumee.core.haikang.model.param.request.VisitAppointmentOutRequest;
 import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest;
 import com.doumee.core.haikang.model.param.respose.VisitAppointmentResponse;
@@ -28,20 +22,17 @@
 import com.doumee.core.utils.DateUtil;
 import com.doumee.core.utils.Utils;
 import com.doumee.core.wx.wxPlat.WxPlatNotice;
-import com.doumee.dao.admin.response.MemberInfoDTO;
 import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.CompanyMapper;
 import com.doumee.dao.business.join.DeviceJoinMapper;
-import com.doumee.dao.business.join.VisitEventJoinMapper;
 import com.doumee.dao.business.join.VisitsJoinMapper;
 import com.doumee.dao.business.model.*;
 import com.doumee.dao.web.reqeust.AuditApproveDTO;
 import com.doumee.dao.web.reqeust.ErpVisitDTO;
 import com.doumee.dao.web.reqeust.ErpWithVisitDTO;
 import com.doumee.dao.web.reqeust.VisitRecordDTO;
-import com.doumee.dao.web.response.InternalHomeVO;
 import com.doumee.dao.web.response.VisitDetailVO;
 import com.doumee.dao.web.response.VisitRecordVO;
-import com.doumee.service.business.ApproveService;
 import com.doumee.service.business.InterfaceLogService;
 import com.doumee.service.business.VisitsService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -50,16 +41,13 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.DigestUtils;
 
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
 
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index bf7dfda..dbef628 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -30,6 +30,7 @@
 import com.doumee.core.utils.redis.RedisUtil;
 import com.doumee.core.wx.wxPlat.WxPlatNotice;
 import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.CompanyMapper;
 import com.doumee.dao.business.join.CarEventJoinMapper;
 import com.doumee.dao.business.join.DeviceEventJoinMapper;
 import com.doumee.dao.business.join.VisitEventJoinMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index 9af2a01..a6ea67e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -16,6 +16,7 @@
 import com.doumee.core.utils.DateUtil;
 import com.doumee.core.utils.ImageBase64Util;
 import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.CompanyMapper;
 import com.doumee.dao.business.join.MemberJoinMapper;
 import com.doumee.dao.business.model.*;
 import com.doumee.service.business.ext.ERPSyncService;
@@ -855,10 +856,11 @@
        }
     }
 
-    private UserAddRequest getUserAddModel(Member c,String path,int type) {
+    public static UserAddRequest getUserAddModel(Member c,String path,int type) {
         UserAddRequest model = new UserAddRequest();
         model.setOrgIndexCode(c.getHkOrgId());
         model.setJobNo(c.getCode());
+        model.setPhoneNo(c.getPhone());
         model.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
         model.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+"");
         model.setPersonId(type == 0 ?UUID.randomUUID().toString().replace("-", ""):c.getHkId());
@@ -874,7 +876,6 @@
             }
             face.setFaceData(imageBase);
             model.getFaces().add(face);
-
         }
         return  model;
     }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
index e598615..df05a04 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
@@ -17,6 +17,7 @@
 import com.doumee.core.utils.DESUtil;
 import com.doumee.core.utils.DateUtil;
 import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.CompanyMapper;
 import com.doumee.dao.business.model.*;
 import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
 import lombok.extern.slf4j.Slf4j;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
index 4f8ce59..0ef439e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
@@ -21,6 +21,7 @@
 import com.doumee.core.utils.DateUtil;
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.CompanyMapper;
 import com.doumee.dao.business.model.Cars;
 import com.doumee.dao.business.model.Member;
 import com.doumee.dao.business.model.Visits;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java
index d92e58f..4679a06 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java
@@ -16,9 +16,9 @@
 import com.doumee.core.utils.DESUtil;
 import com.doumee.core.utils.DateUtil;
 import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.CompanyMapper;
 import com.doumee.dao.business.MemberMapper;
 import com.doumee.dao.business.VisitsMapper;
+import com.doumee.dao.business.dao.CompanyMapper;
 import com.doumee.dao.business.model.Member;
 import com.doumee.dao.business.model.Visits;
 import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;

--
Gitblit v1.9.3