From 11b4993b1ea3fca020948fcc7dde5c3676471b30 Mon Sep 17 00:00:00 2001
From: zxf <1532322479@qq.com>
Date: Sat, 10 Jan 2026 16:24:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=81=8C=E5=B7=A5/?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=91=98=E5=B7=A5=E8=8F=9C=E5=8D=95=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/api/ebuser.js                       |   63 +
 admin/src/api/sysdept.js                      |   18 +
 admin/src/components/DictTag/index.vue        |    2 +-
 .../views/eb/user/ebuser-add-and-update.vue   |  443 +++++++
 admin/src/views/eb/user/index.vue             |  453 +++++++
 admin/src/views/pm/pmowner/index.vue          |   77 +-
 .../pm/pmowner/pmowner-add-and-update.vue     |  169 ++-
 .../pm/pmowner/rent-record-add-and-update.vue |   17 +-
 .../pm/pmowner/tenant-add-and-update.vue      |  372 +++---
 admin/src/views/pm/tenant/index.vue           |    2 +-
 .../pm/tenant/pmtenant-add-and-update.vue     |   12 +-
 .../zbkj/admin/config/WebSecurityConfig.java  |    4 -
 .../autogencode/config/WebMvcConfig.java      |   33 +
 .../controller/EbUserController.java          |  243 +++-
 .../controller/PmTenantController.java        |   36 +-
 .../controller/SysDeptController.java         |  126 +-
 .../autogencode/entity/PmTenantHouseRel.java  |  130 +-
 .../java/com/zbkj/common/model/user/User.java |    9 +
 .../java/com/zbkj/common/vo/SysDeptTree.java  |   15 +-
 .../front/controller/LoginController.java     |  167 +++
 .../zbkj/service/service/SysDeptService.java  |   10 +
 .../service/impl/OrderServiceImpl.java        |    5 +-
 .../service/impl/SysDeptServiceImpl.java      |   44 +-
 .../java/com/zbkj/service/util/SignUtil.java  |   80 ++
 .../com/zbkj/service/util/WeiXinUtil.java     | 1061 +++++++++++++++++
 25 files changed, 3279 insertions(+), 312 deletions(-)
 create mode 100644 admin/src/api/ebuser.js
 create mode 100644 admin/src/views/eb/user/ebuser-add-and-update.vue
 create mode 100644 admin/src/views/eb/user/index.vue
 create mode 100644 crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/config/WebMvcConfig.java
 create mode 100644 crmeb/crmeb-service/src/main/java/com/zbkj/service/util/SignUtil.java
 create mode 100644 crmeb/crmeb-service/src/main/java/com/zbkj/service/util/WeiXinUtil.java

diff --git a/admin/src/api/ebuser.js b/admin/src/api/ebuser.js
new file mode 100644
index 0000000..7d225c6
--- /dev/null
+++ b/admin/src/api/ebuser.js
@@ -0,0 +1,63 @@
+
+import request from '@/utils/request'
+
+/**
+ * 新增ebuser
+ * @param pram
+ */
+export function ebuserCreateApi(data) {
+    return request({
+        url: `autogencode/ebuser/save`,
+        method: 'POST',
+        data
+    })
+}
+
+/**
+ * ebuser更新
+ * @param pram
+ */
+export function ebuserUpdateApi(data) {
+    return request({
+        url: `autogencode/ebuser/update`,
+        method: 'POST',
+        data
+    })
+}
+
+/**
+ * ebuser详情
+ * @param pram
+ */
+export function ebuserDetailApi(id) {
+    return request({
+        url: `autogencode/ebuser/info/${id}`,
+        method: 'GET'
+    })
+}
+
+/**
+ * ebuser批量删除
+ * @param ids
+ */
+export function ebuserDeleteApi(ids) {
+    return request({
+        url: `autogencode/ebuser/delete`,
+        method: 'POST',
+        data: ids
+    })
+}
+
+
+/**
+ * ebuser列表
+ * @param pram
+ */
+export function ebuserListApi(params) {
+    return request({
+        url: `autogencode/ebuser/list`,
+        method: 'GET',
+        params
+    })
+}
+
diff --git a/admin/src/api/sysdept.js b/admin/src/api/sysdept.js
index b6c5c7a..23b2939 100644
--- a/admin/src/api/sysdept.js
+++ b/admin/src/api/sysdept.js
@@ -10,6 +10,24 @@ export function deptTreeSelect(params) {
   })
 }
 
+// 查询部门树
+export function getDeptTreeByPm(params) {
+  return request({
+    url: '/autogencode/sysdept/getDeptTreeByPm',
+    method: 'get',
+    params
+  })
+}
+
+// 查询当前用户的部门树（包含子部门）
+export function getCurrentUserDeptTree(params) {
+  return request({
+    url: '/autogencode/sysdept/getCurrentUserDeptTree',
+    method: 'get',
+    params
+  })
+}
+
 /**
  * 新增sysdept
  * @param pram
diff --git a/admin/src/components/DictTag/index.vue b/admin/src/components/DictTag/index.vue
index 1f262cc..66b84af 100644
--- a/admin/src/components/DictTag/index.vue
+++ b/admin/src/components/DictTag/index.vue
@@ -54,7 +54,7 @@ export default {
         let findIndex = -1;
         try {
           findIndex = this.options.findIndex(val => {
-            return val && val.value !== undefined && val.value === item;
+            return val && val.value !== undefined && val.value == item;
           });
         } catch (e) {
           console.error('Error in DictTag findIndex:', e);
diff --git a/admin/src/views/eb/user/ebuser-add-and-update.vue b/admin/src/views/eb/user/ebuser-add-and-update.vue
new file mode 100644
index 0000000..6e36b22
--- /dev/null
+++ b/admin/src/views/eb/user/ebuser-add-and-update.vue
@@ -0,0 +1,443 @@
+<template>
+  <!-- 基于 Element UI 新增和修改弹窗 -->
+  <el-dialog
+    :title="!dataForm.uid ? '添加' : '修改'"
+    :close-on-click-modal="false"
+    :visible.sync="visible">
+    <!-- 新增和修改表单 -->
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataSubmit()" label-width="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="手机号码" prop="phone">
+            <el-input v-model="dataForm.phone" placeholder="手机号码"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="真实姓名" prop="realName">
+            <el-input v-model="dataForm.realName" placeholder="真实姓名"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="生日" prop="birthday">
+            <el-date-picker
+            v-model="dataForm.birthday"
+            type="date"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择生日"
+            style="width: 100%;"
+          ></el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="身份证号码" prop="cardId">
+            <el-input v-model="dataForm.cardId" placeholder="身份证号码"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="用户昵称" prop="nickname">
+            <el-input v-model="dataForm.nickname" placeholder="用户昵称"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="用户头像" prop="avatar">
+            <el-input v-model="dataForm.avatar" placeholder="用户头像"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="用户状态" prop="status">
+            <el-select v-model="dataForm.status" placeholder="请选择用户状态" style="width: 100%;">
+              <el-option
+                key="true"
+                label="正常"
+                :value="true"
+              />
+              <el-option
+                key="false"
+                label="禁止"
+                :value="false"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="性别" prop="sex">
+            <el-select v-model="dataForm.sex" placeholder="请选择性别" style="width: 100%;">
+              <el-option
+                v-for="dict in dict.type.user_sex"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="用户类型" prop="userType">
+            <el-input v-model="dataForm.userType" placeholder="用户类型"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="员工类型" prop="staffType">
+            <el-select v-model="dataForm.staffType" placeholder="请选择员工类型" style="width: 100%;" @change="handleStaffTypeChange">
+              <el-option
+                v-for="dict in dict.type.staff_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="业主/租户" prop="ownerTenantId">
+            <el-select
+              v-model="dataForm.ownerTenantId"
+              :placeholder="dataForm.staffType ? (dataForm.staffType === '1' ? '请选择业主' : '请选择租户') : '请先选择员工类型'"
+              :disabled="!dataForm.staffType"
+              style="width: 100%;"
+              @change="handleOwnerTenantChange"
+            >
+              <!-- 显示业主列表 -->
+              <el-option
+                v-for="owner in ownerList"
+                :key="owner.id"
+                :label="owner.ownerName"
+                :value="owner.id"
+                v-if="dataForm.staffType === '1'"
+              />
+              <!-- 显示租户列表 -->
+              <el-option
+                v-for="tenant in tenantList"
+                :key="tenant.id"
+                :label="tenant.tenantName"
+                :value="tenant.id"
+                v-if="dataForm.staffType === '2'"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属部门" prop="deptId">
+            <treeselect
+              v-model="dataForm.deptId"
+              :options="deptTreeOptions"
+              :normalizer="normalizer"
+              :placeholder="dataForm.ownerTenantId ? '选择部门' : '请先选择业主/租户'"
+              :disabled="!dataForm.ownerTenantId"
+              :key="dataForm.ownerTenantId + '-' + deptTreeOptions.length"
+              style="width: 100%"
+            ></treeselect>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="用户备注" prop="mark">
+            <el-input v-model="dataForm.mark" placeholder="用户备注" type="textarea"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" @click="dataSubmit()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import * as api from '@/api/ebuser.js'
+import { pmownerListApi } from '@/api/pmowner.js'
+import { pmtenantListApi } from '@/api/pmtenant.js'
+import { deptTreeSelect,getDeptTreeByPm } from '@/api/sysdept.js'
+import Treeselect from "@riophae/vue-treeselect"
+import "@riophae/vue-treeselect/dist/vue-treeselect.css"
+
+export default {
+  dicts: ['user_status','user_sex','staff_type'],
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      visible: false,
+      ownerList: [], // 业主列表
+      tenantList: [], // 租户列表
+      deptTreeOptions: [], // 部门树数据
+      deptMap: {}, // 部门映射关系
+      dataForm: {
+          uid: 0,
+          account: '',
+          pwd: '',
+          realName: '',
+          birthday: '',
+          cardId: '',
+          mark: '',
+          partnerId: '',
+          groupId: '',
+          tagId: '',
+          nickname: '',
+          avatar: '',
+          phone: '',
+          addIp: '',
+          lastIp: '',
+          nowMoney: '',
+          brokeragePrice: '',
+          integral: '',
+          experience: '',
+          signNum: '',
+          status: true,
+          level: '',
+          spreadUid: '',
+          spreadTime: '',
+          userType: '',
+          isPromoter: '',
+          payCount: '',
+          spreadCount: '',
+          addres: '',
+          adminid: '',
+          loginType: '',
+          lastLoginTime: '',
+          cleanTime: '',
+          path: '',
+          subscribe: '',
+          subscribeTime: '',
+          sex: 0,
+          country: '',
+          promoterTime: '',
+          staffType: '',
+          ownerTenantId: '',
+          deptId: 0 // 部门ID
+        },
+      dataRule: {
+        phone: [
+          {required: true, message: '手机号码  为必填项', trigger: 'blur'}
+        ],
+        realName: [
+          {required: true, message: '真实姓名  为必填项', trigger: 'blur'}
+        ],
+        status: [
+          {required: true, message: '用户状态为必填项', trigger: 'blur'}
+        ],
+        staffType: [
+          {required: true, message: '员工类型为必填项', trigger: 'blur'}
+        ],
+        ownerTenantId: [
+          {
+            required: true,
+            message: '请选择业主/租户',
+            trigger: 'blur'
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (value && !this.dataForm.staffType) {
+                callback(new Error('请先选择员工类型'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'blur'
+          }
+        ],
+        deptId: [
+          {required: true, message: '请选择所属部门', trigger: 'blur'}
+        ]
+      }
+    }
+  },
+  methods: {
+    init(id) { // 初始化表单验证规则
+      this.dataForm.uid = id || 0
+      this.visible = true
+      this.$nextTick(function () {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.uid) {
+          api.ebuserDetailApi(id).then(function (res) {
+            this.dataForm = res;
+            // 如果有员工类型，自动查询对应的业主/租户列表
+            if (this.dataForm.staffType) {
+              this.handleStaffTypeChange(this.dataForm.staffType);
+            }
+          }.bind(this))
+        }
+      }.bind(this))
+    },
+    // 处理员工类型变化事件
+    handleStaffTypeChange(type) {
+      // 如果是编辑现有用户且已有业主/租户ID，保留业主/租户ID，否则清空
+      if (!this.dataForm.uid) {
+        this.dataForm.ownerTenantId = '';
+        this.dataForm.deptId = 0;
+      }
+
+      // 根据员工类型调用不同的API
+      if (type === '1') { // 业主
+        pmownerListApi({ page: 1, limit: 1000 }).then(res => {
+          this.ownerList = res.list || [];
+          this.tenantList = [];
+          // 如果是编辑现有用户且已有业主ID，重新加载部门树
+          if (this.dataForm.uid && this.dataForm.ownerTenantId) {
+            this.handleOwnerTenantChange(this.dataForm.ownerTenantId);
+          }
+        }).catch(error => {
+          console.error('获取业主列表失败:', error);
+        });
+      } else if (type === '2') { // 租户
+        pmtenantListApi({ page: 1, limit: 1000 }).then(res => {
+          this.tenantList = res.list || [];
+          this.ownerList = [];
+          // 如果是编辑现有用户且已有租户ID，重新加载部门树
+          if (this.dataForm.uid && this.dataForm.ownerTenantId) {
+            this.handleOwnerTenantChange(this.dataForm.ownerTenantId);
+          }
+        }).catch(error => {
+          console.error('获取租户列表失败:', error);
+        });
+      } else {
+        // 清空列表
+        this.ownerList = [];
+        this.tenantList = [];
+        this.deptTreeOptions = [];
+      }
+    },
+    // 转换部门数据结构
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.deptId || 0,
+        label: node.deptName ? node.deptName : '顶级部门',
+        children: node.children
+      };
+    },
+    // 处理业主/租户变化事件
+    handleOwnerTenantChange(ownerTenantId) {
+      // 保存当前的deptId
+      const currentDeptId = this.dataForm.deptId;
+      
+      // 清空部门Id和部门树选项
+      this.dataForm.deptId = 0;
+      this.deptTreeOptions = [];
+
+      // 如果选择了业主/租户，加载对应的部门树数据
+      if (ownerTenantId) {
+        getDeptTreeByPm({ ownerTenantId: ownerTenantId, staffType: this.dataForm.staffType }).then(res => {
+          const deptTree = res || [];
+          // 检查并去除部门树中重复的deptId
+          const deptIds = new Set();
+          const hasDuplicates = this.checkDuplicateDeptIds(deptTree, deptIds);
+          
+          if (hasDuplicates) {
+            console.warn('部门树中存在重复的deptId，已去除重复部门');
+          }
+          
+          this.deptTreeOptions = deptTree;
+          this.buildDeptMap(deptTree);
+          
+          // 检查currentDeptId是否在deptTree中，只有存在时才恢复
+          if (this.isDeptIdInTree(currentDeptId, deptTree)) {
+            this.dataForm.deptId = currentDeptId;
+          }
+        }).catch(error => {
+          console.error('获取部门树失败:', error);
+          this.deptTreeOptions = [];
+          this.deptMap = {};
+        });
+      } else {
+        this.deptTreeOptions = [];
+        this.deptMap = {};
+      }
+    },
+    // 检查部门树中是否有重复的deptId
+    checkDuplicateDeptIds(deptTree, deptIds = new Set()) {
+      let hasDuplicates = false;
+      
+      const processNode = (node) => {
+        if (node.deptId) {
+          if (deptIds.has(node.deptId)) {
+            hasDuplicates = true;
+          } else {
+            deptIds.add(node.deptId);
+          }
+          
+          if (node.children && node.children.length > 0) {
+            node.children.forEach(child => processNode(child));
+          }
+        }
+      };
+      
+      deptTree.forEach(node => processNode(node));
+      return hasDuplicates;
+    },
+    // 构建部门映射
+    buildDeptMap(depts) {
+      // 清空映射
+      this.deptMap = {};
+
+      const mapDept = (deptList) => {
+        deptList.forEach(dept => {
+          if (dept && dept.deptId) {
+            this.deptMap[dept.deptId] = dept.deptName;
+            if (dept.children && dept.children.length > 0) {
+              mapDept(dept.children);
+            }
+          }
+        });
+      };
+
+      mapDept(depts);
+    },
+    // 检查部门ID是否存在于部门树中
+    isDeptIdInTree(deptId, deptTree) {
+      if (!deptId || !deptTree || !Array.isArray(deptTree)) {
+        return false;
+      }
+
+      for (const dept of deptTree) {
+        if (dept.deptId === deptId) {
+          return true;
+        }
+        if (dept.children && dept.children.length > 0) {
+          if (this.isDeptIdInTree(deptId, dept.children)) {
+            return true;
+          }
+        }
+      }
+
+      return false;
+    },
+    // 表单数据提交
+    dataSubmit() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          if (this.dataForm.uid) {
+            api.ebuserUpdateApi(this.dataForm).then(function (res) {
+              this.$message.success('保存成功')
+              this.visible = false
+              this.$emit('refreshDataList')
+            }.bind(this));
+          } else {
+            api.ebuserCreateApi(this.dataForm).then(function (res) {
+              this.$message.success('新增成功')
+              this.visible = false
+              this.$emit('refreshDataList')
+            }.bind(this));
+          }
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/admin/src/views/eb/user/index.vue b/admin/src/views/eb/user/index.vue
new file mode 100644
index 0000000..fb807b0
--- /dev/null
+++ b/admin/src/views/eb/user/index.vue
@@ -0,0 +1,453 @@
+<template>
+  <div class="divBox">
+    <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
+                    style="margin-bottom: 20px"/>
+        </div>
+        <div class="head-container">
+          <el-tree :data="deptTreeOptions" :props="defaultProps" :expand-on-click-node="false"
+                   :filter-node-method="filterNode" ref="tree" node-key="deptId" default-expand-all highlight-current
+                   @node-click="handleNodeClick"/>
+        </div>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="20" :xs="24">
+        <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form-item label="真实姓名">
+        <el-input v-model="dataForm.realName" placeholder="请输入真实姓名" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="用户昵称">
+        <el-input v-model="dataForm.nickname" placeholder="请输入用户昵称" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="手机号码">
+        <el-input v-model="dataForm.phone" placeholder="请输入手机号码" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="用户状态">
+        <el-select v-model="dataForm.status" placeholder="请选择用户状态" clearable>
+          <el-option label="正常" :value="true"></el-option>
+          <el-option label="禁止" :value="false"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="用户类型">
+        <el-input v-model="dataForm.userType" placeholder="请输入用户类型" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="员工类型">
+        <el-select v-model="dataForm.staffType" placeholder="请选择员工类型" clearable>
+          <el-option v-for="dict in dict.type.staff_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="业主/租户Id">-->
+<!--        <el-input v-model="dataForm.ownerTenantId" placeholder="请输入业主/租户Id" clearable></el-input>-->
+<!--      </el-form-item>-->
+      <el-form-item>
+        <el-button @click="getDataList()">查询</el-button>
+        <el-button @click="resetForm()">重置</el-button>
+        <el-button v-hasPermi="['autogencode:ebuser:save']" type="primary" @click="addOrUpdateHandle()">新增数据</el-button>
+        <el-button v-hasPermi="['autogencode:ebuser:delete']" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      @selection-change="selectionChangeHandle"
+      style="width: 100%;">
+      <el-table-column
+        type="selection"
+        header-align="center"
+        align="center"
+        width="50">
+      </el-table-column>
+      <el-table-column
+        prop="account"
+        header-align="center"
+        align="center"
+        label="用户账号">
+      </el-table-column>
+      <el-table-column
+        prop="realName"
+        header-align="center"
+        align="center"
+        label="真实姓名">
+      </el-table-column>
+      <el-table-column
+        prop="birthday"
+        header-align="center"
+        align="center"
+        label="生日">
+      </el-table-column>
+      <el-table-column
+        prop="cardId"
+        header-align="center"
+        align="center"
+        label="身份证号码">
+      </el-table-column>
+      <el-table-column
+        prop="nickname"
+        header-align="center"
+        align="center"
+        label="用户昵称">
+      </el-table-column>
+      <el-table-column
+        prop="phone"
+        header-align="center"
+        align="center"
+        label="手机号码">
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        header-align="center"
+        align="center"
+        label="用户状态">
+        <template slot-scope="scope">
+          {{ scope.row.status ? '正常' : '禁止' }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="userType"
+        header-align="center"
+        align="center"
+        label="用户类型">
+      </el-table-column>
+      <el-table-column
+        prop="staffType"
+        header-align="center"
+        align="center"
+        label="员工类型">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.staff_type" :value="scope.row.staffType"/>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="deptName"
+        header-align="center"
+        align="center"
+        label="部门名称">
+      </el-table-column>
+      <el-table-column
+        prop="ownerTenantName"
+        header-align="center"
+        align="center"
+        label="业主/租户">
+      </el-table-column>
+      <el-table-column
+        prop="addres"
+        header-align="center"
+        align="center"
+        label="详细地址">
+      </el-table-column>
+      <el-table-column
+        prop="sex"
+        header-align="center"
+        align="center"
+        label="性别">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.user_sex" :value="scope.row.sex"/>
+        </template>
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="150"
+        label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.uid)">{{ '修改' }}</el-button>
+          <el-button v-hasPermi="['autogencode:ebuser:delete']" type="text" size="small" @click="deleteHandle(scope.row.uid)" style="color: #f56c6c;">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <!-- 表单弹窗, 新增数据和修改数据 -->
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import AddOrUpdate from './ebuser-add-and-update'
+  import * as api from '@/api/ebuser.js'
+  import * as deptApi from '@/api/sysdept.js'
+  export default {
+    dicts: ['user_status','user_sex','staff_type'],
+    data () {
+      return {
+        deptTreeOptions: [],
+        deptMap: {},
+        deptName: undefined,
+        defaultProps: {
+          children: 'children',
+          label: 'deptName'
+        },
+        dataForm: {
+          uid: '',
+          account: '',
+          pwd: '',
+          realName: '',
+          birthday: '',
+          cardId: '',
+          mark: '',
+          partnerId: '',
+          groupId: '',
+          tagId: '',
+          nickname: '',
+          avatar: '',
+          phone: '',
+          addIp: '',
+          lastIp: '',
+          nowMoney: '',
+          brokeragePrice: '',
+          integral: '',
+          experience: '',
+          signNum: '',
+          status: '',
+          level: '',
+          spreadUid: '',
+          spreadTime: '',
+          userType: '',
+          isPromoter: '',
+          payCount: '',
+          spreadCount: '',
+          addres: '',
+          adminid: '',
+          loginType: '',
+          lastLoginTime: '',
+          cleanTime: '',
+          path: '',
+          subscribe: '',
+          subscribeTime: '',
+          sex: '',
+          country: '',
+          promoterTime: '',
+          staffType: '',
+          ownerTenantId: '',
+        },
+
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false,
+        dataListSelections: [],
+        addOrUpdateVisible: false
+      }
+    },
+    components: {
+      AddOrUpdate
+    },
+    watch: {
+      deptName(val) {
+        this.$refs.tree.filter(val);
+      }
+    },
+    activated () {
+      this.getDataList()
+    },
+    mounted() {
+      // 确保页面加载时自动查询
+      this.getDataList()
+      this.handleGetDeptList()
+    },
+    methods: {
+      // 重置表单
+      handleGetDeptList() {
+        deptApi.getCurrentUserDeptTree().then(res => {
+          this.deptTreeOptions = res
+          this.buildDeptMap(res)
+        })
+      },
+      filterNode(value, data) {
+        if (!value) return true;
+        return data.deptName.indexOf(value) !== -1;
+      },
+      handleNodeClick(data) {
+        this.dataForm.deptId = data.deptId;
+        this.getDataList();
+      },
+      buildDeptMap(depts) {
+        if (depts) {
+          depts.forEach(dept => {
+            this.deptMap[dept.deptId] = dept.deptName
+            if (dept.children && dept.children.length > 0) {
+              this.buildDeptMap(dept.children)
+            }
+          })
+        }
+      },
+      resetForm() {
+        this.dataForm = {
+          uid: '',
+          account: '',
+          pwd: '',
+          realName: '',
+          birthday: '',
+          cardId: '',
+          mark: '',
+          partnerId: '',
+          groupId: '',
+          tagId: '',
+          nickname: '',
+          avatar: '',
+          phone: '',
+          addIp: '',
+          lastIp: '',
+          nowMoney: '',
+          brokeragePrice: '',
+          integral: '',
+          experience: '',
+          signNum: '',
+          status: '',
+          level: '',
+          spreadUid: '',
+          spreadTime: '',
+          userType: '',
+          isPromoter: '',
+          payCount: '',
+          spreadCount: '',
+          addres: '',
+          adminid: '',
+          loginType: '',
+          lastLoginTime: '',
+          cleanTime: '',
+          path: '',
+          subscribe: '',
+          subscribeTime: '',
+          sex: '',
+          country: '',
+          promoterTime: '',
+          staffType: '',
+          ownerTenantId: '',
+          deptId: '',
+        }
+        this.getDataList()
+      },
+      // 获取数据列表
+      getDataList () {
+        this.dataListLoading = true
+        // 根据后端EbUserController和PageParamRequest的期望格式构建参数
+        const params = {
+          page: this.pageIndex,
+          limit: this.pageSize
+        }
+
+        // 将查询条件添加到参数中
+        if (this.dataForm.uid) params.uid = this.dataForm.uid;
+        if (this.dataForm.account) params.account = this.dataForm.account;
+        if (this.dataForm.pwd) params.pwd = this.dataForm.pwd;
+        if (this.dataForm.realName) params.realName = this.dataForm.realName;
+        if (this.dataForm.birthday) params.birthday = this.dataForm.birthday;
+        if (this.dataForm.cardId) params.cardId = this.dataForm.cardId;
+        if (this.dataForm.mark) params.mark = this.dataForm.mark;
+        if (this.dataForm.partnerId) params.partnerId = this.dataForm.partnerId;
+        if (this.dataForm.groupId) params.groupId = this.dataForm.groupId;
+        if (this.dataForm.tagId) params.tagId = this.dataForm.tagId;
+        if (this.dataForm.nickname) params.nickname = this.dataForm.nickname;
+        if (this.dataForm.avatar) params.avatar = this.dataForm.avatar;
+        if (this.dataForm.phone) params.phone = this.dataForm.phone;
+        if (this.dataForm.addIp) params.addIp = this.dataForm.addIp;
+        if (this.dataForm.lastIp) params.lastIp = this.dataForm.lastIp;
+        if (this.dataForm.nowMoney) params.nowMoney = this.dataForm.nowMoney;
+        if (this.dataForm.brokeragePrice) params.brokeragePrice = this.dataForm.brokeragePrice;
+        if (this.dataForm.integral) params.integral = this.dataForm.integral;
+        if (this.dataForm.experience) params.experience = this.dataForm.experience;
+        if (this.dataForm.signNum) params.signNum = this.dataForm.signNum;
+        if (this.dataForm.status) params.status = this.dataForm.status;
+        if (this.dataForm.level) params.level = this.dataForm.level;
+        if (this.dataForm.spreadUid) params.spreadUid = this.dataForm.spreadUid;
+        if (this.dataForm.spreadTime) params.spreadTime = this.dataForm.spreadTime;
+        if (this.dataForm.userType) params.userType = this.dataForm.userType;
+        if (this.dataForm.isPromoter) params.isPromoter = this.dataForm.isPromoter;
+        if (this.dataForm.payCount) params.payCount = this.dataForm.payCount;
+        if (this.dataForm.spreadCount) params.spreadCount = this.dataForm.spreadCount;
+        if (this.dataForm.addres) params.addres = this.dataForm.addres;
+        if (this.dataForm.adminid) params.adminid = this.dataForm.adminid;
+        if (this.dataForm.loginType) params.loginType = this.dataForm.loginType;
+        if (this.dataForm.lastLoginTime) params.lastLoginTime = this.dataForm.lastLoginTime;
+        if (this.dataForm.cleanTime) params.cleanTime = this.dataForm.cleanTime;
+        if (this.dataForm.path) params.path = this.dataForm.path;
+        if (this.dataForm.subscribe) params.subscribe = this.dataForm.subscribe;
+        if (this.dataForm.subscribeTime) params.subscribeTime = this.dataForm.subscribeTime;
+        if (this.dataForm.sex) params.sex = this.dataForm.sex;
+        if (this.dataForm.country) params.country = this.dataForm.country;
+        if (this.dataForm.promoterTime) params.promoterTime = this.dataForm.promoterTime;
+        if (this.dataForm.staffType) params.staffType = this.dataForm.staffType;
+        if (this.dataForm.ownerTenantId) params.ownerTenantId = this.dataForm.ownerTenantId;
+        if (this.dataForm.deptId) params.deptId = this.dataForm.deptId;
+
+        // 添加参数控制只查询有业主/租户Id的用户
+        params.hasOwnerTenantId = true;
+
+        api.ebuserListApi(params).then(res => {
+          this.dataListLoading = false
+          this.dataList = res.list || [];
+          this.totalPage = res.total;
+        }).catch(e => {
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+      // 多选
+      selectionChangeHandle (val) {
+        this.dataListSelections = val
+      },
+      // 新增 / 修改
+      addOrUpdateHandle (id) {
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(id)
+        })
+      },
+      // 删除处理（支持单个删除和批量删除）
+      deleteHandle (id) {
+        let ids = []
+        let idText = ''
+
+        // 如果传入了单个id参数，则为单个删除
+        if (id) {
+          ids = [id]
+          idText = id
+        } else {
+          // 否则为批量删除
+          ids = this.dataListSelections.map(item => {
+            return item.uid
+          })
+          idText = ids.join(',')
+        }
+
+        this.$confirm(`确定进行删除操作?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          // 调用批量删除API
+          api.ebuserDeleteApi(ids).then(res => {
+            this.$message.success('删除成功')
+            this.getDataList()
+          })
+        })
+      },
+    }
+  }
+</script>
diff --git a/admin/src/views/pm/pmowner/index.vue b/admin/src/views/pm/pmowner/index.vue
index 7fe1606..5b484f1 100644
--- a/admin/src/views/pm/pmowner/index.vue
+++ b/admin/src/views/pm/pmowner/index.vue
@@ -5,12 +5,12 @@
       <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
-            style="margin-bottom: 20px" />
+                    style="margin-bottom: 20px"/>
         </div>
         <div class="head-container">
           <el-tree :data="deptTreeOptions" :props="defaultProps" :expand-on-click-node="false"
-            :filter-node-method="filterNode" ref="tree" node-key="deptId" default-expand-all highlight-current
-            @node-click="handleNodeClick" />
+                   :filter-node-method="filterNode" ref="tree" node-key="deptId" default-expand-all highlight-current
+                   @node-click="handleNodeClick"/>
         </div>
       </el-col>
       <!--业主数据-->
@@ -20,32 +20,51 @@
             <el-input v-model="dataForm.ownerName" placeholder="请输入业主姓名" clearable></el-input>
           </el-form-item>
           <el-form-item label="业主类型">
-            <el-input v-model="dataForm.ownerType" placeholder="请输入业主类型" clearable></el-input>
+            <el-select v-model="dataForm.ownerType" placeholder="请选择业主类型" clearable style="width: 200px;">
+              <el-option
+                v-for="dict in dict.type.owner_Type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="业主状态">
-            <el-input v-model="dataForm.status" placeholder="请输入业主状态" clearable></el-input>
+            <el-select v-model="dataForm.status" placeholder="请选择业主状态" clearable style="width: 200px;">
+              <el-option
+                v-for="dict in dict.type.owner_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item>
             <el-button @click="getDataList()">查询</el-button>
             <el-button @click="resetForm()">重置</el-button>
             <el-button v-hasPermi="['autogencode:pmowner:save']" type="primary"
-              @click="addOrUpdateHandle()">新增数据</el-button>
+                       @click="addOrUpdateHandle()">新增数据
+            </el-button>
             <el-button v-hasPermi="['autogencode:pmowner:delete']" type="danger" @click="deleteHandle()"
-              :disabled="dataListSelections.length <= 0">批量删除</el-button>
+                       :disabled="dataListSelections.length <= 0">批量删除
+            </el-button>
           </el-form-item>
         </el-form>
         <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle"
-          style="width: 100%;">
+                  style="width: 100%;">
           <el-table-column type="selection" header-align="center" align="center" width="50">
           </el-table-column>
           <el-table-column type="expand" header-align="center" align="center">
             <template slot-scope="scope">
-              <TenatList :owner-id="scope.row.id" :show-search="false" />
+              <TenatList :key="tenantListKey" :owner-id="scope.row.id" :show-search="false"/>
             </template>
           </el-table-column>
           <el-table-column prop="ownerName" header-align="center" align="center" label="业主姓名">
           </el-table-column>
           <el-table-column prop="ownerType" header-align="center" align="center" label="业主类型">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.owner_Type" :value="scope.row.ownerType"/>
+            </template>
           </el-table-column>
           <el-table-column prop="ownerIdcard" header-align="center" align="center" label="业主身份证">
           </el-table-column>
@@ -68,23 +87,27 @@
             </template>
           </el-table-column>
           <el-table-column prop="status" header-align="center" align="center" label="业主状态">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.owner_status" :value="scope.row.status"/>
+            </template>
           </el-table-column>
           <el-table-column prop="remark" header-align="center" align="center" label="备注">
           </el-table-column>
-          <el-table-column header-align="center" align="center" width="150" label="操作">
+          <el-table-column header-align="center" align="center" width="150" label="操作" fixed="right">
             <template slot-scope="scope">
               <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ '修改' }}</el-button>
               <el-button v-hasPermi="['autogencode:pmowner:delete']" type="text" size="small"
-                @click="deleteHandle(scope.row.id)" style="color: #f56c6c;">删除</el-button>
+                         @click="deleteHandle(scope.row.id)" style="color: #f56c6c;">删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
         <el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" :current-page="pageIndex"
-          :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" :total="totalPage"
-          layout="total, sizes, prev, pager, next, jumper">
+                       :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" :total="totalPage"
+                       layout="total, sizes, prev, pager, next, jumper">
         </el-pagination>
         <!-- 表单弹窗, 新增数据和修改数据 -->
-        <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+        <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="handleRefresh"></add-or-update>
       </el-col>
     </el-row>
   </div>
@@ -96,12 +119,15 @@ import * as api from '@/api/pmowner.js'
 import * as deptApi from '@/api/sysdept.js'
 import * as houseApi from '@/api/pmhouse.js'
 import TenatList from '@/views/pm/tenant/index';
+import DictTag from '@/components/DictTag'
 
 export default {
   components: {
     TenatList,
-    AddOrUpdate
+    AddOrUpdate,
+    DictTag
   },
+  dicts: ['owner_Type','owner_status'],
   data() {
     return {
       deptTreeOptions: [],
@@ -129,7 +155,9 @@ export default {
       totalPage: 0,
       dataListLoading: false,
       dataListSelections: [],
-      addOrUpdateVisible: false
+      addOrUpdateVisible: false,
+      // 用于强制刷新TenatList组件的key
+      tenantListKey: Date.now()
     }
   },
   watch: {
@@ -168,7 +196,7 @@ export default {
       })
     },
     handleGetHouseList() {
-      houseApi.pmhouseListApi({ page: 1, limit: 9999 }).then(res => {
+      houseApi.pmhouseListApi({page: 1, limit: 9999}).then(res => {
         const houseList = res.list || []
         houseList.forEach(house => {
           this.houseMap[house.id] = `${house.unitNo}单元 ${house.floorNo}层 ${house.houseNo}室`
@@ -277,11 +305,18 @@ export default {
         })
       })
     },
+    // 刷新数据列表（用于业主弹窗关闭后刷新业主列表和租户列表）
+    handleRefresh() {
+      // 更新tenantListKey的值，强制TenatList组件刷新
+      this.tenantListKey = Date.now()
+      // 重新获取业主列表数据
+      this.getDataList()
+    },
   }
 }
 </script>
 <style lang="scss" scoped>
-  ::v-deep .el-table__expanded-cell {
-    padding: 0 !important;
-  }
-</style>
\ No newline at end of file
+::v-deep .el-table__expanded-cell {
+  padding: 0 !important;
+}
+</style>
diff --git a/admin/src/views/pm/pmowner/pmowner-add-and-update.vue b/admin/src/views/pm/pmowner/pmowner-add-and-update.vue
index bdcb120..538ceea 100644
--- a/admin/src/views/pm/pmowner/pmowner-add-and-update.vue
+++ b/admin/src/views/pm/pmowner/pmowner-add-and-update.vue
@@ -3,59 +3,113 @@
   <el-dialog
       :title="!dataForm.id ? '添加' : '修改'"
       :close-on-click-modal="false"
-      :visible.sync="visible">
+      :visible.sync="visible"
+      :append-to-body="true"
+  >
     <!-- 新增和修改表单 -->
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataSubmit()" label-width="100px">
-    <el-form-item label="业主姓名" prop="ownerName">
-      <el-input v-model="dataForm.ownerName" placeholder="业主姓名"></el-input>
-    </el-form-item>
-    <el-form-item label="业主类型" prop="ownerType">
-      <el-input v-model="dataForm.ownerType" placeholder="业主类型"></el-input>
-    </el-form-item>
-    <el-form-item label="业主身份证" prop="ownerIdcard">
-      <el-input v-model="dataForm.ownerIdcard" placeholder="业主身份证"></el-input>
-    </el-form-item>
-    <el-form-item label="联系电话" prop="phone">
-      <el-input v-model="dataForm.phone" placeholder="联系电话"></el-input>
-    </el-form-item>
-    <el-form-item label="电子邮箱" prop="email">
-      <el-input v-model="dataForm.email" placeholder="电子邮箱"></el-input>
-    </el-form-item>
-    <el-form-item label="紧急联系人" prop="emergencyContact">
-      <el-input v-model="dataForm.emergencyContact" placeholder="紧急联系人"></el-input>
-    </el-form-item>
-    <el-form-item label="紧急联系电话" prop="emergencyPhone">
-      <el-input v-model="dataForm.emergencyPhone" placeholder="紧急联系电话"></el-input>
-    </el-form-item>
-    <el-form-item label="所属部门" prop="deptId">
-      <treeselect
-        v-model="dataForm.deptId"
-        :options="deptTreeOptions"
-        :normalizer="normalizer"
-        placeholder="选择部门"
-        style="width: 100%"
-      ></treeselect>
-    </el-form-item>
-    <el-form-item label="所属房屋" prop="houseId">
-      <el-select v-model="dataForm.houseId" placeholder="选择房屋" clearable style="width: 100%">
-        <el-option
-          v-for="item in houseList"
-          :key="item.id"
-          :label="`${item.unitNo}单元 ${item.floorNo}层 ${item.houseNo}室`"
-          :value="item.id"
-        />
-      </el-select>
-    </el-form-item>
-    <el-form-item label="业主状态" prop="status">
-      <el-input v-model="dataForm.status" placeholder="业主状态"></el-input>
-    </el-form-item>
-    <el-form-item label="备注" prop="remark">
-      <el-input v-model="dataForm.remark" placeholder="备注" type="textarea"></el-input>
-    </el-form-item>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="业主姓名" prop="ownerName">
+          <el-input v-model="dataForm.ownerName" placeholder="业主姓名"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="业主类型" prop="ownerType">
+          <el-select v-model="dataForm.ownerType" placeholder="请选择业主类型" style="width: 100%;">
+            <el-option
+              v-for="dict in dict.type.owner_Type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="业主身份证" prop="ownerIdcard">
+          <el-input v-model="dataForm.ownerIdcard" placeholder="业主身份证"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="联系电话" prop="phone">
+          <el-input v-model="dataForm.phone" placeholder="联系电话"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="电子邮箱" prop="email">
+          <el-input v-model="dataForm.email" placeholder="电子邮箱"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="紧急联系人" prop="emergencyContact">
+          <el-input v-model="dataForm.emergencyContact" placeholder="紧急联系人"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="紧急联系电话" prop="emergencyPhone">
+          <el-input v-model="dataForm.emergencyPhone" placeholder="紧急联系电话"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="所属部门" prop="deptId">
+          <treeselect
+            v-model="dataForm.deptId"
+            :options="deptTreeOptions"
+            :normalizer="normalizer"
+            placeholder="选择部门"
+            style="width: 100%"
+          ></treeselect>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="所属房屋" prop="houseId">
+          <el-select v-model="dataForm.houseId" placeholder="选择房屋" clearable style="width: 100%">
+            <el-option
+              v-for="item in houseList"
+              :key="item.id"
+              :label="`${item.unitNo}单元 ${item.floorNo}层 ${item.houseNo}室`"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="业主状态" prop="status">
+          <el-select v-model="dataForm.status" placeholder="请选择业主状态" style="width: 100%;">
+            <el-option
+              v-for="dict in dict.type.owner_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="24">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="dataForm.remark" placeholder="备注" type="textarea"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
     <!-- 显示添加租户按钮 -->
-    <el-form-item>
-      <el-button type="success" @click="addTenant">添加租户</el-button>
-    </el-form-item>
+    <el-row :gutter="20">
+      <el-col :span="24">
+        <el-form-item>
+          <el-button type="success" @click="addTenant">添加租户</el-button>
+        </el-form-item>
+      </el-col>
+    </el-row>
     </el-form>
 
     <!-- 租户列表 -->
@@ -65,7 +119,16 @@
         <el-table-column prop="phome" label="联系电话" width="120"></el-table-column>
         <el-table-column prop="idCard" label="身份证号" width="180"></el-table-column>
         <el-table-column prop="company" label="工作单位" width="150"></el-table-column>
-        <el-table-column prop="status" label="状态" width="100"></el-table-column>
+        <el-table-column label="租户类型" width="120">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.tenant_type" :value="scope.row.tenantType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" width="100">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.tenant_status" :value="scope.row.status"/>
+          </template>
+        </el-table-column>
         <el-table-column prop="remark" label="备注" width="150"></el-table-column>
         <el-table-column label="操作" width="180" fixed="right">
           <template slot-scope="scope">
@@ -94,9 +157,11 @@
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import TenantAddAndUpdate from './tenant-add-and-update.vue'
+  import DictTag from '@/components/DictTag'
 
   export default {
-    components: { Treeselect, TenantAddAndUpdate },
+    components: { Treeselect, TenantAddAndUpdate, DictTag },
+    dicts: ['tenant_type','owner_Type','owner_status','tenant_status'],
     data () {
       return {
         visible: false,
diff --git a/admin/src/views/pm/pmowner/rent-record-add-and-update.vue b/admin/src/views/pm/pmowner/rent-record-add-and-update.vue
index 1323d74..d01cf45 100644
--- a/admin/src/views/pm/pmowner/rent-record-add-and-update.vue
+++ b/admin/src/views/pm/pmowner/rent-record-add-and-update.vue
@@ -4,14 +4,15 @@
       :title="!dataForm.id ? '添加' : '修改'"
       :close-on-click-modal="false"
       :visible.sync="visible"
-      :z-index="2000">
+      :append-to-body="true"
+  >
     <!-- 新增和修改表单 -->
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataSubmit()" label-width="120px">
       <el-form-item label="绑定时间" prop="rentBeginTime">
-        <el-date-picker v-model="dataForm.rentBeginTime" type="datetime" placeholder="选择绑定时间" value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%"></el-date-picker>
+        <el-date-picker v-model="dataForm.rentBeginTime" type="datetime" placeholder="选择绑定时间" value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%"  :z-index="7000"></el-date-picker>
       </el-form-item>
       <el-form-item label="解绑时间" prop="rentEndTime">
-        <el-date-picker v-model="dataForm.rentEndTime" type="datetime" placeholder="选择解绑时间" value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%"></el-date-picker>
+        <el-date-picker v-model="dataForm.rentEndTime" type="datetime" placeholder="选择解绑时间" value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%"  :z-index="7000"></el-date-picker>
       </el-form-item>
       <el-form-item label="押金金额" prop="depositAmount">
         <el-input-number v-model="dataForm.depositAmount" :min="0" :precision="2" placeholder="押金金额" style="width: 100%"></el-input-number>
@@ -23,7 +24,14 @@
         <el-input v-model="dataForm.authScope" placeholder="授权范围"></el-input>
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-input v-model="dataForm.status" placeholder="状态"></el-input>
+        <el-select v-model="dataForm.status" placeholder="请选择状态" style="width: 100%;">
+          <el-option
+            v-for="dict in dict.type.record_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input v-model="dataForm.remark" placeholder="备注" type="textarea"></el-input>
@@ -45,6 +53,7 @@
         default: 0
       }
     },
+    dicts: ['record_status'],
     data () {
       return {
         visible: false,
diff --git a/admin/src/views/pm/pmowner/tenant-add-and-update.vue b/admin/src/views/pm/pmowner/tenant-add-and-update.vue
index 480c91b..b1b20ad 100644
--- a/admin/src/views/pm/pmowner/tenant-add-and-update.vue
+++ b/admin/src/views/pm/pmowner/tenant-add-and-update.vue
@@ -1,17 +1,27 @@
 <template>
   <!-- 基于 Element UI 新增和修改弹窗 -->
   <el-dialog
-      :title="!dataForm.id ? '添加' : '修改'"
-      :close-on-click-modal="false"
-      :visible.sync="visible"
-      :z-index="2000">
+    :title="!dataForm.id ? '添加' : '修改'"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    :append-to-body="true"
+
+
+  >
     <!-- 新增和修改表单 -->
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataSubmit()" label-width="120px">
       <el-form-item label="租户姓名" prop="tenantName">
         <el-input v-model="dataForm.tenantName" placeholder="租户姓名"></el-input>
       </el-form-item>
       <el-form-item label="租户类型" prop="tenantType">
-        <el-input v-model="dataForm.tenantType" placeholder="租户类型(个人、企业)"></el-input>
+        <el-select v-model="dataForm.tenantType" placeholder="请选择租户类型" style="width: 100%;">
+          <el-option
+            v-for="dict in dict.type.tenant_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="身份证号" prop="idCard">
         <el-input v-model="dataForm.idCard" placeholder="身份证号"></el-input>
@@ -22,17 +32,24 @@
       <el-form-item label="工作单位" prop="company">
         <el-input v-model="dataForm.company" placeholder="工作单位"></el-input>
       </el-form-item>
-      <el-form-item label="租户ID" prop="tenantId">
-        <el-input v-model="dataForm.tenantId" placeholder="租户ID"></el-input>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="dataForm.status" placeholder="请选择状态" style="width: 100%;">
+          <el-option
+            v-for="dict in dict.type.tenant_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input v-model="dataForm.remark" placeholder="备注" type="textarea"></el-input>
       </el-form-item>
 
-    <!-- 显示添加租赁记录按钮 -->
-    <el-form-item>
-      <el-button type="success" @click="addRentRecord">添加租赁记录</el-button>
-    </el-form-item>
+      <!-- 显示添加租赁记录按钮 -->
+      <el-form-item>
+        <el-button type="success" @click="addRentRecord">添加租赁记录</el-button>
+      </el-form-item>
     </el-form>
 
     <!-- 租赁记录列表 -->
@@ -51,12 +68,19 @@
           </template>
         </el-table-column>
         <el-table-column prop="authScope" label="授权范围" width="150"></el-table-column>
-        <el-table-column prop="status" label="状态" width="100"></el-table-column>
+        <el-table-column label="状态" width="100">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.record_status" :value="scope.row.status"/>
+          </template>
+        </el-table-column>
         <el-table-column prop="remark" label="备注" width="150"></el-table-column>
         <el-table-column label="操作" width="180" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="editRentRecord(scope.row.id)">{{ '修改' }}</el-button>
-            <el-button type="text" size="small" @click="deleteRentRecord(scope.row.id, scope.$index)">{{ '删除' }}</el-button>
+            <el-button type="text" size="small" @click="deleteRentRecord(scope.row.id, scope.$index)">{{
+                '删除'
+              }}
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -68,154 +92,214 @@
     </span>
 
     <!-- 租赁记录弹窗 -->
-    <rent-record-add-and-update ref="rentRecordAddOrUpdate" :tenantId="dataForm.id" @refreshDataList="getRentRecords" @saveRentRecord="saveRentRecord"></rent-record-add-and-update>
+    <rent-record-add-and-update ref="rentRecordAddOrUpdate" :tenantId="dataForm.id" @refreshDataList="getRentRecords"
+                                @saveRentRecord="saveRentRecord"></rent-record-add-and-update>
   </el-dialog>
 </template>
 
 <script>
-  import * as api from '@/api/pmtenant.js'
-  import * as relApi from '@/api/pmtentanthouserel.js'
-  import * as rentRecordApi from '@/api/pmtenanthouse.js'
-  import RentRecordAddAndUpdate from './rent-record-add-and-update.vue'
-  export default {
-    components: { RentRecordAddAndUpdate },
-    props: {
-      ownerId: {
-        type: Number,
-        default: 0
-      }
-    },
-    data () {
-      return {
-        visible: false,
-        rentRecords: [],
-        dataForm: {
-          id: 0,
-          ownerId: 0,
-          tenantName: '',
-          tenantType: '',
-          idCard: '',
-          phome: '',
-          company: '',
-          status: '',
-          tenantId: '',
-          remark: ''
-        },
-        dataRule: {
-          tenantName: [
-            { required: true, message: '租户姓名  为必填项', trigger: 'blur' }
-          ],
-          phome: [
-            { required: true, message: '联系电话  为必填项', trigger: 'blur' }
-          ],
-          idCard: [
-            { required: true, message: '身份证号  为必填项', trigger: 'blur' }
-          ],
-        }
+import * as api from '@/api/pmtenant.js'
+import * as relApi from '@/api/pmtentanthouserel.js'
+import * as rentRecordApi from '@/api/pmtenanthouse.js'
+import RentRecordAddAndUpdate from './rent-record-add-and-update.vue'
+import DictTag from '@/components/DictTag'
+
+export default {
+  components: {RentRecordAddAndUpdate, DictTag},
+  props: {
+    ownerId: {
+      type: String,
+      default: ''
+    }
+  },
+  dicts: ['tenant_type','record_status','tenant_status'],
+  data() {
+    return {
+      visible: false,
+      rentRecords: [],
+      dataForm: {
+        id: 0,
+        ownerId: '',
+        tenantName: '',
+        tenantType: '',
+        idCard: '',
+        phome: '',
+        company: '',
+        status: '',
+        tenantId: '',
+        remark: ''
+      },
+      dataRule: {
+        tenantName: [
+          {required: true, message: '租户姓名  为必填项', trigger: 'blur'}
+        ],
+        phome: [
+          {required: true, message: '联系电话  为必填项', trigger: 'blur'}
+        ],
+        idCard: [
+          {required: true, message: '身份证号  为必填项', trigger: 'blur'}
+        ],
       }
-    },
-    methods: {
-      init (id, ownerId) { // 初始化表单验证规则
-        this.dataForm.id = id || 0
-        this.dataForm.ownerId = ownerId || 0
-        this.visible = true
-        this.$nextTick(() => {
-          this.$refs['dataForm'].resetFields()
-          if (this.dataForm.id) {
-            api.pmtenantDetailApi(id).then(res => {
-              this.dataForm = res;
-              this.getRentRecords()
-            })
-          } else {
-            this.rentRecords = []
+    }
+  },
+  methods: {
+    init(id, ownerId) { // 初始化表单验证规则
+      this.dataForm.id = id || 0
+      this.dataForm.ownerId = ownerId || ''
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          api.pmtenantDetailApi(id).then(res => {
+            this.dataForm = res;
+            this.getRentRecords()
+          })
+        } else {
+          // 尝试从父组件的tenantList中获取租户数据和租赁记录
+          let foundTenant = null
+          // 查找父组件或祖父组件中的tenantList
+          let parent = this.$parent
+          while (parent) {
+            if (parent.tenantList && Array.isArray(parent.tenantList)) {
+              // 查找匹配的租户
+              foundTenant = parent.tenantList.find(tenant =>
+                tenant.id === this.dataForm.id ||
+                (tenant.id === 0 && tenant.tenantName && tenant.phome)
+              )
+              if (foundTenant) {
+                break
+              }
+            }
+            parent = parent.$parent
           }
-        })
-      },
-      // 获取租赁记录列表
-      getRentRecords() {
-        if (!this.dataForm.id) return
-        rentRecordApi.pmtenanthouseListApi({ rentId: this.dataForm.id, page: 1, limit: 9999 }).then(res => {
-          try {
-            this.rentRecords = Array.isArray(res) ? res : (res.list || [])
-          } catch (error) {
+          // 如果找到租户数据，使用它们
+          if (foundTenant) {
+            // 更新表单数据
+            this.dataForm.tenantName = foundTenant.tenantName
+            this.dataForm.tenantType = foundTenant.tenantType
+            this.dataForm.idCard = foundTenant.idCard
+            this.dataForm.phome = foundTenant.phome
+            this.dataForm.company = foundTenant.company
+            this.dataForm.status = foundTenant.status
+            this.dataForm.remark = foundTenant.remark
+            // 加载租赁记录
+            this.rentRecords = foundTenant.pmTenantHouses || []
+          } else {
             this.rentRecords = []
           }
-        }).catch(err => {
-          this.rentRecords = []
-        })
-      },
-      // 新增租赁记录
-      addRentRecord() {
-        if (this.$refs.rentRecordAddOrUpdate) {
-          this.$refs.rentRecordAddOrUpdate.init(0, this.dataForm.id)
         }
-      },
-      // 编辑租赁记录
-      editRentRecord(id) {
-        if (this.$refs.rentRecordAddOrUpdate) {
-          this.$refs.rentRecordAddOrUpdate.init(id, this.dataForm.id)
+      })
+    },
+    // 获取租赁记录列表
+    getRentRecords() {
+      if (!this.dataForm.id) return
+      rentRecordApi.pmtenanthouseListApi({rentId: this.dataForm.id, page: 1, limit: 9999}).then(res => {
+        try {
+          this.rentRecords = Array.isArray(res) ? res : (res.list || [])
+        } catch (error) {
+          this.rentRecords = []
         }
-      },
-      // 删除租赁记录
-      deleteRentRecord(id, index) {
-        this.$confirm('确定要删除这条租赁记录吗？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          if (id) {
-            rentRecordApi.pmtenanthouseDeleteApi([id]).then(() => {
-              this.$message.success('删除成功')
-              this.rentRecords.splice(index, 1)
-            }).catch(() => {
-              this.$message.error('删除失败')
-            })
-          } else {
-            this.rentRecords.splice(index, 1)
+      }).catch(err => {
+        this.rentRecords = []
+      })
+    },
+    // 新增租赁记录
+    addRentRecord() {
+      if (this.$refs.rentRecordAddOrUpdate) {
+        this.$refs.rentRecordAddOrUpdate.init(0, this.dataForm.id)
+      }
+    },
+    // 编辑租赁记录
+    editRentRecord(id) {
+      if (this.$refs.rentRecordAddOrUpdate) {
+        this.$refs.rentRecordAddOrUpdate.init(id, this.dataForm.id)
+      }
+    },
+    // 删除租赁记录
+    deleteRentRecord(id, index) {
+      this.$confirm('确定要删除这条租赁记录吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (id) {
+          rentRecordApi.pmtenanthouseDeleteApi([id]).then(() => {
             this.$message.success('删除成功')
-          }
-        }).catch(() => {
-          this.$message.info('已取消删除')
-        })
-      },
-      // 保存租赁记录（从租赁记录弹窗接收）
-      saveRentRecord(recordData) {
-        if (!recordData) return
-
-        const existingIndex = this.rentRecords.findIndex(record => record.id === recordData.id)
-
-        if (existingIndex !== -1) {
-          this.rentRecords.splice(existingIndex, 1, recordData)
+            this.rentRecords.splice(index, 1)
+          }).catch(() => {
+            this.$message.error('删除失败')
+          })
         } else {
-          this.rentRecords.push(recordData)
+          this.rentRecords.splice(index, 1)
+          this.$message.success('删除成功')
         }
-      },
-      // 表单数据提交
-      dataSubmit () {
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            const tenantData = {
-              id: this.dataForm.id,
-              tenantName: this.dataForm.tenantName,
-              tenantType: this.dataForm.tenantType,
-              idCard: this.dataForm.idCard,
-              phome: this.dataForm.phome,
-              company: this.dataForm.company,
-              status: this.dataForm.status,
-              remark: this.dataForm.remark,
-              tenantId: this.dataForm.tenantId,
-              pmTenantHouses: this.rentRecords
-            }
+      }).catch(() => {
+        this.$message.info('已取消删除')
+      })
+    },
+    // 保存租赁记录（从租赁记录弹窗接收）
+    saveRentRecord(recordData) {
+      if (!recordData) return
 
-            this.$emit('saveTenant', tenantData)
-            this.$message.success('保存成功')
-            this.visible = false
-            this.$emit('refreshDataList')
-          }
-        })
+      const existingIndex = this.rentRecords.findIndex(record => record.id === recordData.id)
+
+      if (existingIndex !== -1) {
+        this.rentRecords.splice(existingIndex, 1, recordData)
+      } else {
+        this.rentRecords.push(recordData)
       }
+    },
+    // 表单数据提交
+    dataSubmit() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          if (this.dataForm.id) {
+            api.pmtenantUpdateApi(this.dataForm).then(() => {
+              this.$message.success('保存成功')
+              this.visible = false
+              this.$emit('refreshDataList')
+              // 保存时包含租赁记录
+              this.$emit('saveTenant', {...this.dataForm, pmTenantHouses: this.rentRecords})
+            })
+          } else {
+            if (!this.ownerId) {
+              const tenantData = {...this.dataForm, pmTenantHouses: this.rentRecords}
+              this.$message.success('新增成功')
+              this.visible = false
+              this.$emit('saveTenant', tenantData)
+            } else {
+              api.pmtenantCreateApi(this.dataForm).then(res => {
+                const tenantId = res.id
+                const tenantData = {...this.dataForm, id: tenantId}
+                if (tenantId && this.ownerId) {
+                  const relData = {
+                    tenantHouseId: tenantId,
+                    ownerId: this.ownerId,
+                    tenantId: this.dataForm.tenantId,
+                    delFlag: '0'
+                  }
+                  relApi.pmtentanthouserelCreateApi(relData).then(() => {
+                    this.$message.success('新增成功')
+                    this.visible = false
+                    this.$emit('refreshDataList')
+                    this.$emit('saveTenant', tenantData)
+                  }).catch(() => {
+                    this.$message.error('关联关系创建失败')
+                  })
+                } else {
+                  this.$message.success('新增成功')
+                  this.visible = false
+                  this.$emit('refreshDataList')
+                  this.$emit('saveTenant', tenantData)
+                }
+              })
+            }
+          }
+        }
+      })
     }
   }
+}
 </script>
 <style>
 .rent-records-container {
diff --git a/admin/src/views/pm/tenant/index.vue b/admin/src/views/pm/tenant/index.vue
index a236a9e..885f842 100644
--- a/admin/src/views/pm/tenant/index.vue
+++ b/admin/src/views/pm/tenant/index.vue
@@ -263,7 +263,7 @@
       addOrUpdateHandle (id) {
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id)
+          this.$refs.addOrUpdate.init(id, this.dataForm.ownerId)
         })
       },
       // 删除处理（支持单个删除和批量删除）
diff --git a/admin/src/views/pm/tenant/pmtenant-add-and-update.vue b/admin/src/views/pm/tenant/pmtenant-add-and-update.vue
index fb22f4e..b131a65 100644
--- a/admin/src/views/pm/tenant/pmtenant-add-and-update.vue
+++ b/admin/src/views/pm/tenant/pmtenant-add-and-update.vue
@@ -3,7 +3,9 @@
   <el-dialog
       :title="!dataForm.id ? '添加' : '修改'"
       :close-on-click-modal="false"
-      :visible.sync="visible">
+      :visible.sync="visible"
+      :append-to-body="true"
+  >
     <!-- 新增和修改表单 -->
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataSubmit()" label-width="80px">
     <el-form-item label="租户姓名" prop="tenantName">
@@ -38,6 +40,8 @@
 <script>
   import * as api from '@/api/pmtenant.js'
   export default {
+
+    // tenant_status
     data () {
       return {
         visible: false,
@@ -50,6 +54,7 @@
           company: '' ,
           status: '' ,
           remark: '' ,
+          ownerId: '',
         },
         dataRule: {
           tenantName: [
@@ -77,8 +82,9 @@
       }
     },
     methods: {
-      init (id) { // 初始化表单验证规则
+      init (id, ownerId) { // 初始化表单验证规则
         this.dataForm.id = id || 0
+        this.dataForm.ownerId = ownerId || ''
         this.visible = true
         this.$nextTick(function() {
           this.$refs['dataForm'].resetFields()
@@ -86,6 +92,8 @@
             api.pmtenantDetailApi(id).then(function(res) {
               this.dataForm = res;
             }.bind(this))
+          } else if (ownerId) {
+            this.dataForm.ownerId = ownerId;
           }
         }.bind(this))
       },
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebSecurityConfig.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebSecurityConfig.java
index 424bc8d..2ea7106 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebSecurityConfig.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebSecurityConfig.java
@@ -143,10 +143,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
             .antMatchers("/api/public/**").anonymous()
             // 放行公共文件访问
             .antMatchers("/file/public/**").anonymous()
-            // 放行访客预约保存
-            .antMatchers("/api/autogencode/dcvisitbook/save").anonymous()
-            // 放行访客预约列表
-            .antMatchers("/api/autogencode/dcvisitbook/list").anonymous()
             // 除上面外的所有请求全部需要鉴权认证
             .anyRequest().authenticated()
             .and()
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/config/WebMvcConfig.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/config/WebMvcConfig.java
new file mode 100644
index 0000000..d93b4d5
--- /dev/null
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/config/WebMvcConfig.java
@@ -0,0 +1,33 @@
+package com.zbkj.modules.autogencode.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+/**
+ * Web MVC配置类，处理编码问题
+ */
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    /**
+     * 配置StringHttpMessageConverter，确保中文参数正确编码
+     */
+    @Bean
+    public StringHttpMessageConverter stringHttpMessageConverter() {
+        return new StringHttpMessageConverter(StandardCharsets.UTF_8);
+    }
+
+    /**
+     * 注册自定义的消息转换器
+     */
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        converters.add(stringHttpMessageConverter());
+    }
+}
\ No newline at end of file
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/EbUserController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/EbUserController.java
index 7e0bb7d..d0e207d 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/EbUserController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/EbUserController.java
@@ -1,15 +1,29 @@
 package com.zbkj.modules.autogencode.controller;
 
-import java.util.Arrays;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.zbkj.common.model.system.SysDept;
 import com.zbkj.common.model.user.User;
+import com.zbkj.common.model.system.SystemAdmin;
+import com.zbkj.common.model.system.SysDeptUser;
 import com.zbkj.common.request.PageParamRequest;
 import com.zbkj.common.response.CommonResult;
 import com.zbkj.common.page.CommonPage;
+import com.zbkj.common.utils.CrmebUtil;
+import com.zbkj.common.utils.SecurityUtil;
+import com.zbkj.common.vo.LoginUserVo;
 import com.zbkj.service.service.UserService;
+import com.zbkj.service.service.SystemAdminService;
+import com.zbkj.service.service.SysDeptUserService;
+import com.zbkj.service.service.SysDeptService;
+import com.zbkj.modules.autogencode.service.PmOwnerService;
+import com.zbkj.modules.autogencode.service.PmTenantService;
+import com.zbkj.modules.autogencode.entity.PmOwner;
+import com.zbkj.modules.autogencode.entity.PmTenant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -32,6 +46,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 public class EbUserController {
     @Autowired
     private UserService ebUserService;
+    
+    @Autowired
+    private SystemAdminService systemAdminService;
+    
+    @Autowired
+    private SysDeptUserService sysDeptUserService;
+    
+    @Autowired
+    private SysDeptService sysDeptService;
+    
+    @Autowired
+    private PmOwnerService pmOwnerService;
+    
+    @Autowired
+    private PmTenantService pmTenantService;
 
 
 
@@ -241,7 +270,16 @@ public class EbUserController {
         if (request.getPromoterTime() != null) {
             queryWrapper.eq(User::getPromoterTime, request.getPromoterTime());
         }
-            
+        
+        // 业主/租户Id
+        if (request.getOwnerTenantId() != null) {
+            queryWrapper.eq(User::getOwnerTenantId, request.getOwnerTenantId());
+        }
+        
+        // 是否只查询有业主/租户Id的用户
+        if (request.getHasOwnerTenantId() != null && request.getHasOwnerTenantId()) {
+            queryWrapper.isNotNull(User::getOwnerTenantId);
+        }
     }
 
 
@@ -249,17 +287,133 @@ public class EbUserController {
      * 分页显示用户表
      * @param request 搜索条件
      * @param pageParamRequest 分页参数
+     * @param hasOwnerTenantId 是否只查询有业主/租户Id的用户
      */
     @ApiOperation(value = "分页列表")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<User>>  getList(@Validated User request, @Validated PageParamRequest pageParamRequest) {
+    public CommonResult<CommonPage<Map<String, Object>>>  getList(@Validated User request, @Validated PageParamRequest pageParamRequest,
+            @RequestParam(required = false) Boolean hasOwnerTenantId) {
+
         LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper();
 
         // 应用搜索条件
         condition(queryWrapper, request);
+        
+        // 通过当前用户的部门及其子部门过滤用户
+        LoginUserVo loginUserVo = SecurityUtil.getLoginUserVo();
+        if (loginUserVo != null && loginUserVo.getUser() != null) {
+            SystemAdmin currentAdmin = loginUserVo.getUser();
+            // 查询当前用户所属的部门
+            List<SysDeptUser> deptUsers = sysDeptUserService.list(Wrappers.<SysDeptUser>lambdaQuery()
+                    .eq(SysDeptUser::getUserId, Long.valueOf(currentAdmin.getId())));
+            
+            if (deptUsers != null && !deptUsers.isEmpty()) {
+                // 获取当前用户的所有部门ID
+                List<Long> deptIds = deptUsers.stream().map(SysDeptUser::getDeptId).collect(Collectors.toList());
+                
+                // 查询这些部门及其所有子部门的ID
+                List<Long> allDeptIds = new ArrayList<>();
+                for (Long deptId : deptIds) {
+                    // 获取当前部门
+                    allDeptIds.add(deptId);
+                    // 查询当前部门的所有子部门（使用ancestors字段进行过滤）
+                    List<SysDept> childDepts = sysDeptService.list(Wrappers.<SysDept>lambdaQuery()
+                            .apply("CONCAT(',', ancestors, ',') LIKE {0}", "%" + deptId + "%")
+                            .eq(SysDept::getDelFlag, "0"));
+                    if (childDepts != null && !childDepts.isEmpty()) {
+                        allDeptIds.addAll(childDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList()));
+                    }
+                }
+                
+                // 查询这些部门下的所有用户
+                List<SysDeptUser> allDeptUsers = sysDeptUserService.list(Wrappers.<SysDeptUser>lambdaQuery()
+                        .in(SysDeptUser::getDeptId, allDeptIds));
+                
+                if (allDeptUsers != null && !allDeptUsers.isEmpty()) {
+                    // 获取这些用户的admin ID
+                    List<Long> adminIds = allDeptUsers.stream().map(SysDeptUser::getUserId).collect(Collectors.toList());
+                    
+                    // 查询这些admin ID对应的用户
+                    List<SystemAdmin> admins = systemAdminService.list(Wrappers.<SystemAdmin>lambdaQuery()
+                            .in(SystemAdmin::getId, adminIds));
+                    
+                    if (admins != null && !admins.isEmpty()) {
+                        // 获取用户ID列表
+                        List<Integer> userIds = admins.stream().map(SystemAdmin::getId).collect(Collectors.toList());
+                        
+                        // 添加用户ID过滤条件
+                        queryWrapper.in(User::getAdminid, userIds);
+                    } else {
+                        // 如果没有找到用户，返回空结果
+                        queryWrapper.in(User::getUid, -1);
+                    }
+                } else {
+                    // 如果没有找到部门用户，返回空结果
+                    queryWrapper.in(User::getUid, -1);
+                }
+            } else {
+                // 如果当前用户没有所属部门，返回空结果
+                queryWrapper.in(User::getUid, -1);
+            }
+        }
+
 
         CommonPage<User> page = CommonPage.restPage(ebUserService.pageList(queryWrapper, pageParamRequest));
-        return CommonResult.success(page);
+        
+        // 转换为包含ownerTenantName和deptName虚拟字段的Map列表
+        List<Map<String, Object>> userListWithVirtualField = page.getList().stream().map(user -> {
+            Map<String, Object> userMap = cn.hutool.core.bean.BeanUtil.beanToMap(user);
+            String ownerTenantName = "";
+            String deptName = "";
+            
+            if (user.getOwnerTenantId() != null) {
+                // 根据staffType判断是业主还是租户
+                if ("1".equals(user.getStaffType())) {
+                    // 查询业主名称
+                    PmOwner pmOwner = pmOwnerService.getById(user.getOwnerTenantId());
+                    if (pmOwner != null) {
+                        ownerTenantName = pmOwner.getOwnerName();
+                    }
+                } else if ("2".equals(user.getStaffType())) {
+                    // 查询租户名称
+                    PmTenant pmTenant = pmTenantService.getById(user.getOwnerTenantId());
+                    if (pmTenant != null) {
+                        ownerTenantName = pmTenant.getTenantName();
+                    }
+                }
+            }
+            
+            // 查询部门名称
+            if (user.getAdminid() != null) {
+                // 根据adminid查询对应的部门用户关系
+                List<SysDeptUser> deptUsers = sysDeptUserService.list(Wrappers.<SysDeptUser>lambdaQuery()
+                        .eq(SysDeptUser::getUserId, Long.valueOf(user.getAdminid())));
+                
+                if (deptUsers != null && !deptUsers.isEmpty()) {
+                    // 获取第一个部门的ID
+                    Long deptId = deptUsers.get(0).getDeptId();
+                    // 查询部门信息
+                    SysDept dept = sysDeptService.getById(deptId);
+                    if (dept != null) {
+                        deptName = dept.getDeptName();
+                    }
+                }
+            }
+            
+            userMap.put("ownerTenantName", ownerTenantName);
+            userMap.put("deptName", deptName);
+            return userMap;
+        }).collect(java.util.stream.Collectors.toList());
+        
+        // 创建新的CommonPage对象
+        CommonPage<Map<String, Object>> resultPage = new CommonPage<>();
+        resultPage.setList(userListWithVirtualField);
+        resultPage.setTotal(page.getTotal());
+        resultPage.setPage(page.getPage());
+        resultPage.setLimit(page.getLimit());
+        resultPage.setTotalPage(page.getTotalPage());
+        
+        return CommonResult.success(resultPage);
     }
 
 
@@ -278,7 +432,40 @@ public class EbUserController {
      */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public CommonResult<String> save(@RequestBody User ebUser){
+
+        // 将手机号码作为账号和密码
+        ebUser.setAccount(ebUser.getPhone());
+        ebUser.setPwd(CrmebUtil.encryptPassword(ebUser.getPhone(), ebUser.getPhone()));
+        
+        // 保存用户数据
         if (ebUserService.save(ebUser)) {
+            // 将用户数据保存到admin表
+            SystemAdmin admin = new SystemAdmin();
+            admin.setAccount(ebUser.getPhone()); // 手机号作为账号
+            admin.setPwd(CrmebUtil.encryptPassword(ebUser.getPhone(), ebUser.getPhone())); // 手机号作为密码，并加密存储
+            admin.setRealName(ebUser.getRealName());
+            admin.setPhone(ebUser.getPhone());
+            admin.setStatus(true); // 默认为有效状态
+            admin.setIsDel(false); // 默认为不删除
+            admin.setCreateTime(new Date());
+            admin.setUpdateTime(new Date());
+            admin.setRoles("6"); // 角色权限默认设置为6
+            
+            // 保存admin数据
+            if (systemAdminService.save(admin)) {
+                // 将admin的ID保存到ebUser的adminid字段中
+                ebUser.setAdminid(admin.getId());
+                ebUserService.updateById(ebUser);
+                
+                // 处理部门关联
+                if (ebUser.getDeptId() != null) {
+                    SysDeptUser sysDeptUser = new SysDeptUser();
+                    sysDeptUser.setUserId(Long.valueOf(admin.getId()));
+                    sysDeptUser.setDeptId(Long.valueOf(ebUser.getDeptId()));
+                    sysDeptUserService.save(sysDeptUser);
+                }
+            }
+            
             return CommonResult.success();
         }
         return CommonResult.failed();
@@ -289,7 +476,35 @@ public class EbUserController {
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     public CommonResult<String> update(@RequestBody User ebUser){
+        // 更新用户数据
         if (ebUserService.updateById(ebUser)) {
+            // 根据用户手机号查询对应的admin记录
+            LambdaQueryWrapper<SystemAdmin> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(SystemAdmin::getPhone, ebUser.getPhone());
+            SystemAdmin admin = systemAdminService.getOne(queryWrapper);
+            
+            if (admin != null) {
+                // 更新admin表中的信息
+                admin.setRealName(ebUser.getRealName());
+                admin.setPhone(ebUser.getPhone());
+                admin.setUpdateTime(new Date());
+                
+                // 保存admin更新
+                if (systemAdminService.updateById(admin)) {
+                    // 处理部门关联：先删除原有关联
+                    sysDeptUserService.remove(new LambdaQueryWrapper<SysDeptUser>()
+                        .eq(SysDeptUser::getUserId, Long.valueOf(admin.getId())));
+                    
+                    // 添加新的部门关联
+                    if (ebUser.getDeptId() != null) {
+                        SysDeptUser sysDeptUser = new SysDeptUser();
+                        sysDeptUser.setUserId(Long.valueOf(admin.getId()));
+                        sysDeptUser.setDeptId(Long.valueOf(ebUser.getDeptId()));
+                        sysDeptUserService.save(sysDeptUser);
+                    }
+                }
+            }
+            
             return CommonResult.success();
         }
         return CommonResult.failed();
@@ -300,6 +515,24 @@ public class EbUserController {
      */
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     public CommonResult<String> delete(@RequestBody Integer[] uids){
+        // 遍历所有要删除的用户ID
+        for (Integer uid : uids) {
+            // 获取用户信息
+            User user = ebUserService.getById(uid);
+            if (user != null && user.getAdminid() != null) {
+                // 获取对应的adminid
+                Integer adminId = user.getAdminid();
+                
+                // 删除关联的SysDeptUser记录
+                sysDeptUserService.remove(Wrappers.<SysDeptUser>lambdaQuery()
+                        .eq(SysDeptUser::getUserId, Long.valueOf(adminId)));
+                
+                // 删除对应的SystemAdmin记录
+                systemAdminService.removeById(adminId);
+            }
+        }
+        
+        // 删除用户记录
         if (ebUserService.removeByIds(Arrays.asList(uids))) {
             return CommonResult.success();
         }
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmTenantController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmTenantController.java
index 2726e89..952774c 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmTenantController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmTenantController.java
@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zbkj.common.request.PageParamRequest;
 import com.zbkj.common.response.CommonResult;
 import com.zbkj.common.page.CommonPage;
+import com.zbkj.modules.autogencode.entity.PmTenantHouse;
+import com.zbkj.modules.autogencode.service.PmTenantHouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -39,6 +41,9 @@ public class PmTenantController {
     
     @Autowired
     private PmTenantHouseRelService pmTenantHouseRelService;
+    
+    @Autowired
+    private PmTenantHouseService pmTenantHouseService;
 
 
 
@@ -46,7 +51,7 @@ public class PmTenantController {
      * 条件设置
      * 根据实体类字段自动生成查询条件
      */
-    private void condition(LambdaQueryWrapper<PmTenant> queryWrapper, PmTenant request) {
+    private void condition(LambdaQueryWrapper<PmTenant> queryWrapper, PmTenant request, Long ownerId) {
         if (request == null) {
             return;
         }
@@ -128,6 +133,21 @@ public class PmTenantController {
             queryWrapper.eq(PmTenant::getTenantId, request.getTenantId());
         }
             
+        // 根据业主ID查询租户
+        if (ownerId != null) {
+            LambdaQueryWrapper<PmTenantHouseRel> relQueryWrapper = new LambdaQueryWrapper<>();
+            relQueryWrapper.eq(PmTenantHouseRel::getOwnerId, ownerId);
+            relQueryWrapper.eq(PmTenantHouseRel::getDelFlag, "0");
+            List<PmTenantHouseRel> rels = pmTenantHouseRelService.list(relQueryWrapper);
+            
+            List<Long> tenantIds = rels.stream().map(PmTenantHouseRel::getTenantHouseId).collect(Collectors.toList());
+            
+            if (!tenantIds.isEmpty()) {
+                queryWrapper.in(PmTenant::getId, tenantIds);
+            } else {
+                queryWrapper.eq(PmTenant::getId, -1L); // 没有匹配的租户，返回空结果
+            }
+        }
     }
 
 
@@ -138,11 +158,13 @@ public class PmTenantController {
      */
     @ApiOperation(value = "分页列表")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<PmTenant>>  getList(@Validated PmTenant request, @Validated PageParamRequest pageParamRequest) {
+    public CommonResult<CommonPage<PmTenant>>  getList(@Validated PmTenant request, 
+                                                      @RequestParam(required = false) Long ownerId,
+                                                      @Validated PageParamRequest pageParamRequest) {
         LambdaQueryWrapper<PmTenant> queryWrapper = new LambdaQueryWrapper();
         
         // 应用搜索条件
-        condition(queryWrapper, request);
+        condition(queryWrapper, request, ownerId);
         
         CommonPage<PmTenant> page = CommonPage.restPage(pmTenantService.pageList(queryWrapper, pageParamRequest));
         return CommonResult.success(page);
@@ -186,6 +208,14 @@ public class PmTenantController {
      */
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     public CommonResult<String> delete(@RequestBody Long[] ids){
+        // 删除前需要判断，有没有相关的PmTenantHouse没有删除
+        LambdaQueryWrapper<PmTenantHouse> tenantHouseQuery = new LambdaQueryWrapper<>();
+        tenantHouseQuery.in(PmTenantHouse::getRentId, Arrays.asList(ids));
+        long tenantHouseCount = pmTenantHouseService.count(tenantHouseQuery);
+        if (tenantHouseCount > 0) {
+            return CommonResult.failed("删除失败，该租户下存在关联的租赁记录，请先删除关联的租赁记录");
+        }
+        
         if (pmTenantService.removeByIds(Arrays.asList(ids))) {
             return CommonResult.success();
         }
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/SysDeptController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/SysDeptController.java
index 8d98add..94b64d8 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/SysDeptController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/SysDeptController.java
@@ -12,11 +12,25 @@ import com.zbkj.common.response.CommonResult;
 import com.zbkj.common.page.CommonPage;
 import com.zbkj.common.vo.SysDeptTreeVo;
 import com.zbkj.service.service.SysDeptService;
+import com.zbkj.modules.autogencode.entity.PmOwner;
+import com.zbkj.modules.autogencode.entity.PmTenantHouse;
+import com.zbkj.modules.autogencode.entity.PmTenantHouseRel;
+import com.zbkj.modules.autogencode.service.PmOwnerService;
+import com.zbkj.modules.autogencode.service.PmTenantHouseService;
+import com.zbkj.modules.autogencode.service.PmTenantHouseRelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
+import java.util.Date;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.zbkj.common.utils.SecurityUtil;
+import com.zbkj.common.vo.LoginUserVo;
+import com.zbkj.common.model.system.SysDeptUser;
 
 
 
@@ -34,6 +48,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 public class SysDeptController {
     @Autowired
     private SysDeptService sysDeptService;
+    
+    @Autowired
+    private PmOwnerService pmOwnerService;
+    
+    @Autowired
+    private PmTenantHouseService pmTenantHouseService;
+    
+    @Autowired
+    private PmTenantHouseRelService pmTenantHouseRelService;
+    
+    @Autowired
+    private com.zbkj.service.service.SysDeptUserService sysDeptUserService;
 
 
 
@@ -206,14 +232,112 @@ public class SysDeptController {
      * 获取部门树形结构
      * @param deptName 部门名称
      * @param status 部门状态
+     * @param ownerTenantId 业主/租户ID
+     * @param staffType 员工类型
      * @return List<SysDeptTreeVo>
      */
     @ApiOperation(value = "获取部门树形结构")
     @RequestMapping(value = "/tree", method = RequestMethod.GET)
     public CommonResult<List<SysDeptTreeVo>> getDeptTree(
             @RequestParam(required = false) String deptName,
-            @RequestParam(required = false) String status) {
+            @RequestParam(required = false) String status,
+            @RequestParam(required = false) Long ownerTenantId,
+            @RequestParam(required = false) String staffType) {
         return CommonResult.success(sysDeptService.getDeptTree(deptName, status));
     }
 
+    /**
+     * 获取部门树形结构
+     * @param deptName 部门名称
+     * @param status 部门状态
+     * @param ownerTenantId 业主/租户ID
+     * @param staffType 员工类型
+     * @return List<SysDeptTreeVo>
+     */
+    @ApiOperation(value = "获取部门树形结构")
+    @RequestMapping(value = "/getDeptTreeByPm", method = RequestMethod.GET)
+    public CommonResult<List<SysDeptTreeVo>> getDeptTreeByPm(
+            @RequestParam(required = false) String deptName,
+            @RequestParam(required = false) String status,
+            @RequestParam(required = false) Long ownerTenantId,
+            @RequestParam(required = false) String staffType) {
+
+        // 根据staffType和ownerTenantId获取实际用于过滤的deptId
+        Long actualDeptId = null;
+        
+        if (staffType != null && !staffType.isEmpty() && ownerTenantId != null) {
+            // 如果 staffType为1时是业主，为2时是租户
+            if ("1".equals(staffType)) {
+                // 为业主时查询PmOwner表，获取其deptId
+                PmOwner pmOwner = pmOwnerService.getById(ownerTenantId);
+                if (pmOwner != null) {
+                    actualDeptId = pmOwner.getDeptId();
+                }
+            } else if ("2".equals(staffType)) {
+                // 为租户时查询pm_tenant_house表，并且是当前时间还在的
+                Date now = new Date();
+                LambdaQueryWrapper<PmTenantHouse> tenantHouseWrapper = new LambdaQueryWrapper<>();
+                tenantHouseWrapper.eq(PmTenantHouse::getRentId, ownerTenantId)
+                                .eq(PmTenantHouse::getDelFlag, "0")
+                                .le(PmTenantHouse::getRentBeginTime, now)
+                                .ge(PmTenantHouse::getRentEndTime, now);
+                PmTenantHouse tenantHouse = pmTenantHouseService.getOne(tenantHouseWrapper);
+                
+                if (tenantHouse != null) {
+                    // 通过pm_tenant_house_rel查询出对应的业主ID
+                    LambdaQueryWrapper<PmTenantHouseRel> tenantHouseRelWrapper = new LambdaQueryWrapper<>();
+                    tenantHouseRelWrapper.eq(PmTenantHouseRel::getTenantHouseId, tenantHouse.getId())
+                                       .eq(PmTenantHouseRel::getDelFlag, "0");
+                    PmTenantHouseRel tenantHouseRel = pmTenantHouseRelService.getOne(tenantHouseRelWrapper);
+                    
+                    if (tenantHouseRel != null) {
+                        // 查询业主信息，获取其deptId
+                        PmOwner pmOwner = pmOwnerService.getById(tenantHouseRel.getOwnerId());
+                        if (pmOwner != null) {
+                            actualDeptId = pmOwner.getDeptId();
+                        }
+                    }
+                }
+            }
+        }
+        List<SysDeptTreeVo> deptTree = sysDeptService.getDeptTree(deptName, status, actualDeptId, staffType);
+        return CommonResult.success(deptTree);
+    }
+    
+    /**
+     * 获取当前用户的部门及其子部门的部门树
+     * @param deptName 部门名称
+     * @param status 部门状态
+     * @return List<SysDeptTreeVo>
+     */
+    @ApiOperation(value = "获取当前用户的部门及其子部门的部门树")
+    @RequestMapping(value = "/getCurrentUserDeptTree", method = RequestMethod.GET)
+    public CommonResult<List<SysDeptTreeVo>> getCurrentUserDeptTree(
+            @RequestParam(required = false) String deptName,
+            @RequestParam(required = false) String status) {
+        // 获取当前登录用户信息
+        LoginUserVo loginUserVo = SecurityUtil.getLoginUserVo();
+        if (loginUserVo == null || loginUserVo.getUser() == null) {
+            return CommonResult.success(new ArrayList<SysDeptTreeVo>());
+        }
+        
+        // 查询当前用户所属的部门
+        List<SysDeptUser> deptUsers = sysDeptUserService.list(Wrappers.<SysDeptUser>lambdaQuery()
+                .eq(SysDeptUser::getUserId, Long.valueOf(loginUserVo.getUser().getId())));
+        
+        if (deptUsers == null || deptUsers.isEmpty()) {
+            return CommonResult.success(new ArrayList<SysDeptTreeVo>());
+        }
+        
+        // 获取当前用户的所有部门ID
+        List<Long> deptIds = deptUsers.stream().map(SysDeptUser::getDeptId).collect(Collectors.toList());
+        
+        // 这里我们只处理用户的第一个部门（如果有多个部门的话）
+        Long actualDeptId = deptIds.get(0);
+        
+        // 使用现有的getDeptTree方法，传入当前用户的部门ID作为过滤条件
+        List<SysDeptTreeVo> deptTree = sysDeptService.getDeptTree(deptName, status, actualDeptId, null);
+        return CommonResult.success(deptTree);
+    }
+
 }
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmTenantHouseRel.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmTenantHouseRel.java
index 0d4552a..a5f1035 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmTenantHouseRel.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmTenantHouseRel.java
@@ -5,76 +5,80 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 
-	import java.io.Serializable;
+import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 
 @Data
 @TableName("pm_tenant_house_rel")
 public class PmTenantHouseRel implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    /**
+     * 租赁信息id
+     */
+    @ApiModelProperty(value = "租赁信息id")
+    private Long tenantHouseId;
+    /**
+     * 业主id
+     */
+    @ApiModelProperty(value = "业主id")
+    private Long ownerId;
+    /**
+     * 房屋id
+     */
+    @ApiModelProperty(value = "房屋id")
+    private Long houseId;
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+    /**
+     * 创建部门
+     */
+    @ApiModelProperty(value = "创建部门")
+    private Long createDept;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private Long createBy;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 修改人
+     */
+    @ApiModelProperty(value = "修改人")
+    private Long updateBy;
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+    /**
+     * 租户ID
+     */
+    @ApiModelProperty(value = "租户ID")
+    private String tenantId;
+
+
 
-	/**
-		 * id
-	 */
-	@ApiModelProperty(value = "id")
-	@TableId(type = IdType.AUTO)
-	private Long id;
-	/**
-		 * 租赁信息id
-	 */
-	@ApiModelProperty(value = "租赁信息id")
-	private Long tenantHouseId;
-	/**
-		 * 业主id
-	 */
-	@ApiModelProperty(value = "业主id")
-	private Long ownerId;
-	/**
-		 * 房屋id
-	 */
-	@ApiModelProperty(value = "房屋id")
-	private Long houseId;
-	/**
-		 * 备注
-	 */
-	@ApiModelProperty(value = "备注")
-	private String remark;
-	/**
-		 * 删除标志（0代表存在 2代表删除）
-	 */
-	@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
-	private String delFlag;
-	/**
-		 * 创建部门
-	 */
-	@ApiModelProperty(value = "创建部门")
-	private Long createDept;
-	/**
-		 * 创建人
-	 */
-	@ApiModelProperty(value = "创建人")
-	private Long createBy;
-	/**
-		 * 创建时间
-	 */
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-	/**
-		 * 修改人
-	 */
-	@ApiModelProperty(value = "修改人")
-	private Long updateBy;
-	/**
-		 * 修改时间
-	 */
-	@ApiModelProperty(value = "修改时间")
-	private Date updateTime;
-	/**
-		 * 租户ID
-	 */
-	@ApiModelProperty(value = "租户ID")
-	private String tenantId;
 
 }
diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/User.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/User.java
index d6345ca..b8f4f13 100644
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/User.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/User.java
@@ -1,6 +1,7 @@
 package com.zbkj.common.model.user;
 
 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.fasterxml.jackson.annotation.JsonIgnore;
@@ -163,5 +164,13 @@ public class User implements Serializable {
     @ApiModelProperty(value = "业主/租户Id")
     private Long ownerTenantId;
 
+    @ApiModelProperty(value = "部门id")
+    private Long deptId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "是否只查询有业主/租户Id的用户（虚拟字段，不存储数据库）")
+    private Boolean hasOwnerTenantId;
+
+
 
 }
\ No newline at end of file
diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SysDeptTree.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SysDeptTree.java
index c7ae164..b75420e 100644
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SysDeptTree.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SysDeptTree.java
@@ -19,10 +19,19 @@ public class SysDeptTree {
     //建立树形结构
     public List<SysDeptTreeVo> buildTree(){
         List<SysDeptTreeVo> treeDepts = new ArrayList<>();
-        for(SysDeptTreeVo deptNode : getRootNode()) {
-            deptNode = buildChildTree(deptNode);
-            treeDepts.add(deptNode);
+        List<SysDeptTreeVo> rootNodes = getRootNode();
+        
+        // 如果有根节点，正常构建树形结构
+        if (CollUtil.isNotEmpty(rootNodes)) {
+            for(SysDeptTreeVo deptNode : rootNodes) {
+                deptNode = buildChildTree(deptNode);
+                treeDepts.add(deptNode);
+            }
+        } else if (CollUtil.isNotEmpty(deptList)) {
+            // 如果没有根节点但有部门数据，直接返回所有部门（处理只有一个非根节点的情况）
+            treeDepts.addAll(deptList);
         }
+        
         return sortList(treeDepts);
     }
 
diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/LoginController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/LoginController.java
index 62d3436..e70aedc 100644
--- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/LoginController.java
+++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/LoginController.java
@@ -1,12 +1,24 @@
 package com.zbkj.front.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zbkj.common.model.user.User;
+import com.zbkj.common.model.user.UserToken;
 import com.zbkj.common.request.LoginMobileRequest;
 import com.zbkj.common.request.LoginRequest;
+import com.zbkj.common.request.RegisterThirdUserRequest;
 import com.zbkj.common.response.CommonResult;
 import com.zbkj.common.response.LoginResponse;
+import com.zbkj.common.token.FrontTokenComponent;
+import com.zbkj.common.token.WeChatOauthToken;
+import com.zbkj.common.vo.WeChatMiniAuthorizeVo;
 import com.zbkj.front.service.LoginService;
 import com.zbkj.service.service.SmsService;
+import com.zbkj.service.service.UserService;
+import com.zbkj.service.service.UserTokenService;
+import com.zbkj.service.service.WechatNewService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -17,6 +29,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
 
 /**
  * 用户登陆 前端控制器
@@ -42,6 +55,18 @@ public class LoginController {
     @Autowired
     private LoginService loginService;
 
+    @Autowired
+    private WechatNewService wechatNewService;
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private UserTokenService userTokenService;
+
+    @Autowired
+    private FrontTokenComponent tokenComponent;
+
     /**
      * 手机号登录接口
      */
@@ -71,6 +96,145 @@ public class LoginController {
         return CommonResult.success();
     }
 
+    /**
+     * 获取公众号openId
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @ApiOperation(value = "获取openId")
+    @PostMapping("/getGzhOpenId")
+    public CommonResult<JSONObject> getGzhOpenId(@RequestBody LoginRequest loginBody) {
+        JSONObject result = new JSONObject();
+        
+        // 生成令牌
+        if (loginBody.getPassword() == null) {
+            return CommonResult.failed("请传入微信Code");
+        }
+        if (loginBody.getPhone() == null) {
+            return CommonResult.failed("请传ghzCode");
+        }
+        
+        // 这里使用密码字段暂存wxCode，手机字段暂存gzhCode
+        WeChatMiniAuthorizeVo xcxToken = wechatNewService.miniAuthCode(loginBody.getPassword());
+        if (xcxToken == null || xcxToken.getOpenId() == null) {
+            return CommonResult.failed("wxCode错误");
+        }
+        
+        WeChatOauthToken gzhToken = wechatNewService.getOauth2AccessToken(loginBody.getPhone());
+        if (gzhToken == null || gzhToken.getOpenId() == null) {
+            return CommonResult.failed("gzhCode错误");
+        }
+        
+        result.put("openId", xcxToken.getOpenId());
+        result.put("gzhOpenId", gzhToken.getOpenId());
+//        result.put("unionId", xcxToken.getUnionId() != null ? xcxToken.getUnionId() : gzhToken.getUnionId());
+        
+        return CommonResult.success(result);
+    }
+
+    /**
+     * 绑定微信信息
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @ApiOperation(value = "绑定微信")
+    @PostMapping("/bindingWx")
+    public CommonResult<JSONObject> bindingWx(@RequestBody LoginRequest loginBody) {
+        JSONObject result = new JSONObject();
+        
+        // 使用密码字段暂存wxCode
+        if (loginBody.getPassword() == null) {
+            return CommonResult.failed("请传入微信Code");
+        }
+        
+        WeChatMiniAuthorizeVo xcxToken = wechatNewService.miniAuthCode(loginBody.getPassword());
+        if (xcxToken == null || xcxToken.getOpenId() == null) {
+            return CommonResult.failed("微信code错误");
+        }
+        
+        // 判断微信是否被其他用户绑定
+        LambdaQueryWrapper<UserToken> userTokenWrapper = new LambdaQueryWrapper<>();
+        userTokenWrapper.eq(UserToken::getType, 2); // 2表示小程序
+        UserToken tempUserToken = userTokenService.getOne(userTokenWrapper);
+        if (tempUserToken != null) {
+            return CommonResult.failed("此微信已被绑定");
+        }
+        
+        // 这里需要获取当前登录用户，CRMEB应该有自己的获取当前用户的方式
+        // 假设当前用户ID可以从登录信息中获取，这里暂时使用phone字段
+        LambdaQueryWrapper<User> currentUserWrapper = new LambdaQueryWrapper<>();
+        currentUserWrapper.eq(User::getPhone, loginBody.getPhone());
+        User currentUser = userService.getOne(currentUserWrapper);
+        
+        if (currentUser == null) {
+            return CommonResult.failed("当前用户不存在");
+        }
+        
+        // 更新用户微信信息
+        // User类没有openId和unionId字段，微信信息存储在UserToken表中
+        UserToken userToken = new UserToken();
+        userToken.setUid(currentUser.getUid());
+        userToken.setType(2); // 2表示小程序
+        
+        userTokenService.save(userToken);
+        
+        result.put("message", "绑定成功");
+        result.put("user", currentUser);
+        
+        return CommonResult.success(result);
+    }
+
+    /**
+     * 微信登录
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @ApiOperation(value = "微信登录")
+    @PostMapping("/wxlogin")
+    public CommonResult<JSONObject> wxlogin(@RequestBody LoginRequest loginBody) {
+        JSONObject result = new JSONObject();
+        
+        // 使用密码字段暂存wxCode
+        String wxCode = loginBody.getPassword();
+        WeChatMiniAuthorizeVo xcxToken = null;
+        
+        if (wxCode != null) {
+            xcxToken = wechatNewService.miniAuthCode(wxCode);
+        }
+        
+        if (xcxToken == null || xcxToken.getOpenId() == null) {
+            return CommonResult.failed("微信登录失败，code错误");
+        }
+        
+        // 根据openId查询用户
+        // 注意：在CRMEB中，微信登录信息存储在UserToken表中，而不是User表
+        LambdaQueryWrapper<UserToken> userTokenWrapper = new LambdaQueryWrapper<>();
+        userTokenWrapper.eq(UserToken::getType, 2); // 2表示小程序
+        UserToken userToken = userTokenService.getOne(userTokenWrapper);
+        
+        User sysUser = null;
+        if (userToken != null) {
+            sysUser = userService.getById(userToken.getUid());
+        }
+        
+        if (sysUser == null) {
+            // 未找到用户，需要手动绑定
+            result.put("code", "501");
+            result.put("openId", xcxToken.getOpenId());
+            result.put("gzhOpenId", "");
+            result.put("unionId", xcxToken.getUnionId());
+            return CommonResult.success(result);
+        }
+        
+        // 生成登录响应
+        String token = tokenComponent.createToken(sysUser);
+        
+        result.put("token", token);
+        result.put("user", sysUser);
+        
+        return CommonResult.success(result);
+    }
+
     /**
      * 发送短信登录验证码
      * @param phone 手机号码
@@ -88,6 +252,9 @@ public class LoginController {
             return CommonResult.failed("发送失败");
         }
     }
+
+
+
 }
 
 
diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SysDeptService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SysDeptService.java
index 982f4db..51184af 100644
--- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SysDeptService.java
+++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SysDeptService.java
@@ -36,4 +36,14 @@ public interface SysDeptService extends IService<SysDept> {
      * @return List<SysDeptTreeVo>
      */
     List<SysDeptTreeVo> getDeptTree(String deptName, String status);
+    
+    /**
+     * 获取部门树形结构（带业主/租户过滤）
+     * @param deptName 部门名称
+     * @param status 部门状态
+     * @param actualDeptId 实际部门ID（用于过滤）
+     * @param staffType 员工类型
+     * @return List<SysDeptTreeVo>
+     */
+    List<SysDeptTreeVo> getDeptTree(String deptName, String status, Long actualDeptId, String staffType);
 }
\ No newline at end of file
diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java
index 834e4e0..f926cd0 100644
--- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java
+++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java
@@ -1101,7 +1101,8 @@ public class OrderServiceImpl implements OrderService {
         storeOrder.setCreateTime(DateUtil.nowDateTime());
         storeOrder.setShippingType(request.getShippingType());
         storeOrder.setIsChannel(isChannel);
-        storeOrder.setPaid(false);
+        //storeOrder.setPaid(false);
+        storeOrder.setPaid(true);
         storeOrder.setCost(BigDecimal.ZERO);
         storeOrder.setType(0);
         if (orderInfoVo.getIsVideo()) {
@@ -1186,7 +1187,7 @@ public class OrderServiceImpl implements OrderService {
         }
 
         // 加入自动未支付自动取消队列
-        redisUtil.lPush(Constants.ORDER_AUTO_CANCEL_KEY, storeOrder.getOrderId());
+        //redisUtil.lPush(Constants.ORDER_AUTO_CANCEL_KEY, storeOrder.getOrderId());
 
         // 发送后台管理员下单提醒通知短信
         sendAdminOrderNotice(storeOrder.getOrderId());
diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SysDeptServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SysDeptServiceImpl.java
index 1ec18a5..1ca76ed 100644
--- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SysDeptServiceImpl.java
+++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SysDeptServiceImpl.java
@@ -20,6 +20,7 @@ import javax.annotation.Resource;
 import java.util.Map;
 import java.util.Arrays;
 import java.util.List;
+import java.util.ArrayList;
 import java.util.stream.Collectors;
 
 
@@ -30,7 +31,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptDao, SysDept> impleme
     @Resource
     private SysDeptDao dao;
 
-    
+
     /**
      * 带分页参数的列表查询实现
      */
@@ -50,7 +51,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptDao, SysDept> impleme
     public List<SysDeptTreeVo> getDeptTree() {
         return getDeptTree(null, null);
     }
-    
+
     /**
      * 获取部门树形结构（带搜索参数）
      * @param deptName 部门名称
@@ -59,19 +60,50 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptDao, SysDept> impleme
      */
     @Override
     public List<SysDeptTreeVo> getDeptTree(String deptName, String status) {
+        return getDeptTree(deptName, status, null, null);
+    }
+
+    /**
+     * 获取部门树形结构（带业主/租户过滤）
+     * @param deptName 部门名称
+     * @param status 部门状态
+     * @param actualDeptId 实际部门ID（用于过滤）
+     * @param staffType 员工类型
+     * @return List<SysDeptTreeVo>
+     */
+    @Override
+    public List<SysDeptTreeVo> getDeptTree(String deptName, String status, Long actualDeptId, String staffType) {
         LambdaQueryWrapper<SysDept> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysDept::getDelFlag, "0");
-        
-        // 添加部门名称搜索条件
+
+        // 添加部门名称搜索条件（处理中文编码问题）
         if (deptName != null && !deptName.isEmpty()) {
+            // 确保中文参数正确编码
             queryWrapper.like(SysDept::getDeptName, deptName);
         }
-        
+
         // 添加部门状态搜索条件
         if (status != null && !status.isEmpty()) {
             queryWrapper.eq(SysDept::getStatus, status);
         }
-        
+
+        // 查询该部门及其所有子部门（只有当actualDeptId不为null时才添加过滤条件）
+        if (actualDeptId != null) {
+            // 先获取该部门的信息
+            SysDept targetDept = dao.selectById(actualDeptId);
+            if (targetDept != null) {
+                // 使用ancestors字段进行过滤，子部门的ancestors包含父部门的ID
+                queryWrapper.and(wrapper -> {
+                    // 1. 匹配当前部门本身
+                    wrapper.eq(SysDept::getDeptId, actualDeptId)
+                            // 2. 匹配所有子部门（祖先节点包含当前部门ID）
+                            // 统一处理：先给ancestors前后加逗号，再匹配 ",actualDeptId,", 避免部分匹配错误
+                            .or()
+                            .apply("CONCAT(',', ancestors, ',') LIKE {0}", "%" + actualDeptId + "%");
+                });
+            }
+        }
+
         queryWrapper.orderByAsc(SysDept::getOrderNum);
         List<SysDept> deptList = dao.selectList(queryWrapper);
         
diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/SignUtil.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/SignUtil.java
new file mode 100644
index 0000000..d5adcfe
--- /dev/null
+++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/SignUtil.java
@@ -0,0 +1,80 @@
+package com.zbkj.service.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Formatter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ *
+ * <br>
+ * 名称： WeiXinUtil <br>
+ * 描述： 微信工具类
+ *
+ * @author Tjw
+ * @date 2019年8月7日 下午3:21:16
+ */
+@Slf4j
+@Component
+public class SignUtil {
+	public static Map<String, String> sign(String jsapi_ticket, String url) {
+		Map<String, String> ret = new HashMap<String, String>();
+		String nonce_str = create_nonce_str();
+		String timestamp = create_timestamp();
+		String string1;
+		String signature = "";
+		//注意这里参数名必须全部小写，且必须有序
+		string1 = "jsapi_ticket=" + jsapi_ticket +
+				"&noncestr=" + nonce_str +
+				"&timestamp=" + timestamp +
+				"&url=" + url;
+		try
+		{
+			MessageDigest crypt = MessageDigest.getInstance("SHA-1");
+			crypt.reset();
+			crypt.update(string1.getBytes("UTF-8"));
+			signature = byteToHex(crypt.digest());
+		}
+		catch (NoSuchAlgorithmException e)
+		{
+			e.printStackTrace();
+		}
+		catch (UnsupportedEncodingException e)
+		{
+			e.printStackTrace();
+		}
+		ret.put("nonceStr", nonce_str);
+		ret.put("timestamp", timestamp);
+		ret.put("signature", signature);
+
+		return ret;
+	}
+
+	private static String byteToHex(final byte[] hash) {
+		Formatter formatter = new Formatter();
+		for (byte b : hash)
+		{
+			formatter.format("%02x", b);
+		}
+		String result = formatter.toString();
+		formatter.close();
+		return result;
+	}
+
+	private static String create_nonce_str() {
+		return UUID.randomUUID().toString();
+	}
+
+	private static String create_timestamp() {
+		return Long.toString(System.currentTimeMillis() / 1000);
+	}
+
+
+
+}
diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/WeiXinUtil.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/WeiXinUtil.java
new file mode 100644
index 0000000..2fde833
--- /dev/null
+++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/WeiXinUtil.java
@@ -0,0 +1,1061 @@
+package com.zbkj.service.util;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ *
+ * <br>
+ * 名称： WeiXinUtil <br>
+ * 描述： 微信工具类
+ *
+ * @author Tjw
+ * @date 2019年8月7日 下午3:21:16
+ */
+@Slf4j
+@Component
+public class WeiXinUtil {
+	// 日期格式
+	private static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	// 微信小程序appid
+	private static String appid="wx72fabe1da6e6fb82" ;
+	// 微信小程序appsecret
+	private static String appsecret="24479b73fc113f01048e7236378c6ce8";
+
+	// 微信公众号appid
+	private static String gzhappid="wxe8539d3b62c9a06c";
+	// 微信公众号appsecret
+	private static String gzhappsecret="84f607283501d0177ca7595f709c20ca";
+
+	// 微信开放号appid
+	private static String openAppid = "";
+	// 微信开放号appsecret
+	private static String openAppsecret = "";
+	// 微信开放号授权回调域
+	private static String openUrl = "";
+
+	// 静态变量用于缓存access_token和过期时间
+	private static String cachedAccessToken = null;
+	private static long accessTokenExpireTime = 0;
+
+	/**
+	 *
+	 * <br>
+	 * 描述：获取openid(小程序)
+	 *
+	 * @param code
+	 * @return
+	 * @date: 2019年8月10日 下午3:25:24
+	 * @author Tjw
+	 */
+	public  JSONObject getXCXOpenId(String code) {
+		/*String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + appid + "&secret=" + appsecret
+				+ "&code=" + code + "&grant_type=authorization_code";*/
+		String url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + appid + "&secret=" + appsecret
+				+ "&js_code=" + code + "&grant_type=authorization_code";
+		try {
+			log.info("获取openid请求url：" + url);
+			HttpResponse response = HttpRequest.get(url)
+					.timeout(5 * 60 * 1000)
+					.execute();
+			String values = response.body();
+			log.info("获取openid返回数据：" +values);
+			JSONObject jsonObject = JSON.parseObject(values);
+			String openId = jsonObject.getString("openid");
+			String session_key = jsonObject.getString("session_key");
+			String unionid = jsonObject.getString("unionid");
+			openId = openId == null ? "" : openId;
+			session_key = session_key == null ? "" : session_key;
+			unionid = unionid == null ? "" : unionid;
+			JSONObject jo = new JSONObject();
+			jo.put("unionid",unionid);
+			jo.put("openId",openId);
+			jo.put("session_key",session_key);
+			return jo;
+		} catch (Exception e) {
+			log.error("openId获取异常", e);
+			JSONObject jo = new JSONObject();
+			jo.put("msg","openId获取异常");
+			jo.put("code","501");
+			return jo;
+		}
+	}
+
+	/**
+	 *
+	 * <br>
+	 * 描述：获取公众号openid
+	 *
+	 * @param code
+	 * @return
+	 * @date: 2019年8月10日 下午3:25:24
+	 * @author Tjw
+	 */
+	public  JSONObject getGZHOpenId(String code) {
+		String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + gzhappid + "&secret=" + gzhappsecret
+				+ "&code=" + code + "&grant_type=authorization_code";
+		try {
+			log.info("获取openid请求url：" + url);
+			HttpResponse response = HttpRequest.get(url)
+					.timeout(5 * 60 * 1000)
+					.execute();
+			String values = response.body();
+			log.info("获取openid返回数据：" +values);
+			JSONObject jsonObject = JSON.parseObject(values);
+			String openId = jsonObject.getString("openid");
+			String access_token = jsonObject.getString("access_token");
+			String unionid = jsonObject.getString("unionid");
+			String refresh_token = jsonObject.getString("refresh_token");
+			openId = openId == null ? "" : openId;
+			access_token = access_token == null ? "" : access_token;
+			unionid = unionid == null ? "" : unionid;
+			refresh_token = refresh_token == null ? "" : refresh_token;
+			JSONObject jo = new JSONObject();
+			jo.put("unionid",unionid);
+			jo.put("openId",openId);
+			jo.put("accessToken",access_token);
+			jo.put("refreshToken",refresh_token);
+			return jo;
+		} catch (Exception e) {
+			log.error("openId获取异常", e);
+			JSONObject jo = new JSONObject();
+			jo.put("msg","openId获取异常");
+			jo.put("code","501");
+			return jo;
+		}
+	}
+
+	/**
+	 * 描述：刷新access_token
+	 */
+	public  JSONObject getRefreshToken(String refreshToken) {
+		String url = "https://api.weixin.qq.com/sns/oauth2/refresh_token?appid=" + gzhappid + "&grant_type=authorization_code"
+				+ "&refresh_token=" + refreshToken;
+		try {
+			log.info("获取刷新access_token请求url：" + url);
+			HttpResponse response = HttpRequest.get(url)
+					.timeout(5 * 60 * 1000)
+					.execute();
+			String values = response.body();
+			log.info("获取刷新access_token返回数据：" +values);
+			JSONObject jsonObject = JSON.parseObject(values);
+			String openId = jsonObject.getString("openid");
+			String access_token = jsonObject.getString("access_token");
+			String unionid = jsonObject.getString("unionid");
+			String refresh_token_new = jsonObject.getString("refresh_token");
+			openId = openId == null ? "" : openId;
+			access_token = access_token == null ? "" : access_token;
+			unionid = unionid == null ? "" : unionid;
+			refresh_token_new = refresh_token_new == null ? "" : refresh_token_new;
+			JSONObject jo = new JSONObject();
+			jo.put("unionid",unionid);
+			jo.put("openId",openId);
+			jo.put("accessToken",access_token);
+			jo.put("refreshToken",refresh_token_new);
+			return jo;
+		} catch (Exception e) {
+			log.error("openId获取异常", e);
+			JSONObject jo = new JSONObject();
+			jo.put("msg","openId获取异常");
+			jo.put("code","501");
+			return jo;
+		}
+	}
+
+
+	/**
+	 * 描述：刷新access_token
+	 */
+	public  Map<String, String> getConfig(String url) {
+		Map<String, String> sign = new HashMap<>();
+		try {
+			String titcket = getTitcket();
+			sign = SignUtil.sign(titcket, url);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		sign.put("appId", gzhappid);
+		return sign;
+	}
+
+//	/**
+//	 * 描述：获取access_token
+//	 */
+//	public  JSONObject getAccessTokenByConfig() {
+//		String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=authorization_code"
+//				+ "&appid=" + gzhappid + "&secret=" + openAppsecret;
+//		try {
+//			log.info("获取刷新access_token请求url：" + url);
+//			HttpResponse response = HttpRequest.get(url)
+//					.timeout(5 * 60 * 1000)
+//					.execute();
+//			String values = response.body();
+//			log.info("获取刷新access_token返回数据：" +values);
+//			JSONObject jsonObject = JSON.parseObject(values);
+//			String access_token = jsonObject.getString("access_token");
+//			access_token = access_token == null ? "" : access_token;
+//			JSONObject jo = new JSONObject();
+//			jo.put("accessToken",access_token);
+//			return jo;
+//		} catch (Exception e) {
+//			log.error("openId获取异常", e);
+//			JSONObject jo = new JSONObject();
+//			jo.put("msg","openId获取异常");
+//			jo.put("code","501");
+//			return jo;
+//		}
+//	}
+
+//	/**
+//	 * 描述：获取ticket
+//	 */
+//	public  JSONObject getTicket() {
+//		String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=authorization_code"
+//				+ "&appid=" + gzhappid + "&secret=" + openAppsecret;
+////		https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=ACCESS_TOKEN&type=jsapi
+//		try {
+//			log.info("获取刷新access_token请求url：" + url);
+//			HttpResponse response = HttpRequest.get(url)
+//					.timeout(5 * 60 * 1000)
+//					.execute();
+//			String values = response.body();
+//			log.info("获取刷新access_token返回数据：" +values);
+//			JSONObject jsonObject = JSON.parseObject(values);
+//			String access_token = jsonObject.getString("access_token");
+//			access_token = access_token == null ? "" : access_token;
+//			JSONObject jo = new JSONObject();
+//			jo.put("accessToken",access_token);
+//			return jo;
+//		} catch (Exception e) {
+//			log.error("openId获取异常", e);
+//			JSONObject jo = new JSONObject();
+//			jo.put("msg","openId获取异常");
+//			jo.put("code","501");
+//			return jo;
+//		}
+//	}
+
+	/**
+	 * 描述：拉取用户信息
+	 */
+	public  JSONObject getUserInfoBySnsapi(String accessToken,String openid) {
+		String url = "https://api.weixin.qq.com/sns/userinfo?access_token=" + accessToken + "&openid=" + openid
+				+ "&lang=zh_CN";
+		try {
+			log.info("获取用户信息请求url：" + url);
+			HttpResponse response = HttpRequest.get(url)
+					.timeout(5 * 60 * 1000)
+					.execute();
+			String values = response.body();
+			log.info("获取用户信息返回数据：" +values);
+			JSONObject jsonObject = JSON.parseObject(values);
+			String openId = jsonObject.getString("openid");
+			String unionid = jsonObject.getString("unionid");
+			String nickname = jsonObject.getString("nickname");
+			String sex = jsonObject.getString("sex");
+			String province = jsonObject.getString("province");
+			String city = jsonObject.getString("city");
+			String country = jsonObject.getString("country");
+			String headimgurl = jsonObject.getString("headimgurl");
+			String privilege = jsonObject.getString("privilege");
+			openId = openId == null ? "" : openId;
+			unionid = unionid == null ? "" : unionid;
+			nickname = nickname == null ? "" : nickname;
+			sex = sex == null ? "" : sex;
+			province = province == null ? "" : province;
+			city = city == null ? "" : city;
+			country = country == null ? "" : country;
+			headimgurl = headimgurl == null ? "" : headimgurl;
+			privilege = privilege == null ? "" : privilege;
+			JSONObject jo = new JSONObject();
+			jo.put("unionid",unionid);
+			jo.put("openid",openId);
+			jo.put("nickname",nickname);
+			jo.put("sex",sex);
+			jo.put("province",province);
+			jo.put("city",city);
+			jo.put("country",country);
+			jo.put("headimgurl",headimgurl);
+			jo.put("privilege",privilege);
+			return jo;
+		} catch (Exception e) {
+			log.error("openId获取异常", e);
+			JSONObject jo = new JSONObject();
+			jo.put("msg","openId获取异常");
+			jo.put("code","501");
+			return jo;
+		}
+	}
+
+
+	/**
+	 *
+	 * <br>
+	 * 描述：获取openid
+	 *
+	 * @param code
+	 * @return
+	 * @date: 2019年8月10日 下午3:25:24
+	 * @author Tjw
+	 */
+	public  String getPcOpenId(String code,HttpServletRequest request) {
+		String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + openAppid + "&secret=" + openAppsecret
+				+ "&code=" + code + "&grant_type=authorization_code";
+		try {
+			log.info("获取openid请求url：" + url);
+			HttpResponse response = HttpRequest.get(url)
+					.timeout(5 * 60 * 1000)
+					.execute();
+			String values = response.body();
+			log.info("获取openid返回数据：" + values);
+			JSONObject jsonObject = JSON.parseObject(values);
+			String openId = jsonObject.getString("openid");
+			String access_token = jsonObject.getString("access_token");
+			String unionid = jsonObject.getString("unionid");
+			openId = openId == null ? "" : openId;
+			access_token = access_token == null ? "" : access_token;
+			unionid = unionid == null ? "" : unionid;
+			request.getSession().setAttribute("openId", openId);
+			request.getSession().setAttribute("access_token", access_token);
+			request.getSession().setAttribute("unionid", unionid);
+			return openId;
+		} catch (Exception e) {
+			log.error("openId获取异常", e);
+			return "openId获取异常";
+		}
+	}
+
+	/**
+	 *
+	 * <br>
+	 * 描述：获得code
+	 *
+	 * @param request
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 * @date: 2019年8月10日 下午3:26:00
+	 * @author Tjw
+	 */
+	public  String getCode(HttpServletRequest request) throws UnsupportedEncodingException {
+		String authorize = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=APPID&redirect_uri=REDIRECT_URI&response_type=code&scope=SCOPE&state=STATE#wechat_redirect";
+		String url = authorize.replace("APPID", appid)
+				.replace("REDIRECT_URI", URLEncoder.encode(request.getRequestURL().toString(), "utf-8"))
+				.replace("SCOPE", "snsapi_userinfo");
+		String queryString = request.getQueryString();
+		if (StringUtils.isNotEmpty(queryString)) {
+			url = url.replace("STATE", request.getQueryString());
+		}
+		log.info("获得code的url：" + url);
+		return url;
+	}
+
+	/**
+	 *
+	 * <br>
+	 * 描述：绑定微信时PC端商户获得微信开放号code
+	 *
+	 * @param request
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 * @date: 2020年3月26日 下午3:26:00
+	 * @author Tjw
+	 */
+	public  String getBindPcCode(HttpServletRequest request) throws UnsupportedEncodingException {
+		String authorize = "https://open.weixin.qq.com/connect/qrconnect?appid=APPID&redirect_uri=REDIRECT_URI&response_type=code&scope=SCOPE&state=STATE#wechat_redirect";
+		String url = authorize.replace("APPID", openAppid)
+				.replace("REDIRECT_URI", URLEncoder.encode(openUrl + "/merchant/index/bindWeixin", "utf-8"))
+				.replace("SCOPE", "snsapi_login");
+		String queryString = request.getQueryString();
+		if (StringUtils.isNotEmpty(queryString)) {
+			url = url.replace("STATE", request.getQueryString());
+		}
+		log.info("获得PC端code的url：" + url);
+		return url;
+	}
+
+	/**
+	 *
+	 * <br>
+	 * 描述：绑定微信时PC端服务商获得微信开放号code
+	 *
+	 * @param request
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 * @date: 2020年3月26日 下午3:26:00
+	 * @author Tjw
+	 */
+	public  String getBindPcLedgerCode(HttpServletRequest request) throws UnsupportedEncodingException {
+		String authorize = "https://open.weixin.qq.com/connect/qrconnect?appid=APPID&redirect_uri=REDIRECT_URI&response_type=code&scope=SCOPE&state=STATE#wechat_redirect";
+		String url = authorize.replace("APPID", openAppid)
+				.replace("REDIRECT_URI", URLEncoder.encode(openUrl + "/ledger/index/bindWeixin", "utf-8"))
+				.replace("SCOPE", "snsapi_login");
+		String queryString = request.getQueryString();
+		if (StringUtils.isNotEmpty(queryString)) {
+			url = url.replace("STATE", request.getQueryString());
+		}
+		log.info("获得PC端code的url：" + url);
+		return url;
+	}
+
+	/**
+	 *
+	 * <br>
+	 * 描述：微信登录时PC端获得微信开放号code
+	 *
+	 * @param request
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 * @date: 2020年3月26日 下午3:26:00
+	 * @author Tjw
+	 */
+	public  String getLoginPcCode(HttpServletRequest request) throws UnsupportedEncodingException {
+		String authorize = "https://open.weixin.qq.com/connect/qrconnect?appid=APPID&redirect_uri=REDIRECT_URI&response_type=code&scope=SCOPE&state=STATE#wechat_redirect";
+		String url = authorize.replace("APPID", openAppid)
+				.replace("REDIRECT_URI", URLEncoder.encode(openUrl + "/merchant/login/loginWeixin", "utf-8"))
+				.replace("SCOPE", "snsapi_login");
+		String queryString = request.getQueryString();
+		if (StringUtils.isNotEmpty(queryString)) {
+			url = url.replace("STATE", request.getQueryString());
+		}
+		log.info("获得PC端code的url：" + url);
+		return url;
+	}
+
+	/**
+	 * 获取access_token
+	 * <br>描述：
+	 * @return
+	 * @date: 2020年4月10日 下午5:38:17
+	 * @author tanjunwei
+	 */
+	public  String getAccessToken() {
+		String access_token = getAccess_token(gzhappid, gzhappsecret);
+		return access_token;
+	}
+
+
+
+	// xml事件推送
+	public  String sendImageText(HttpServletResponse httpServletResponse, String toUserName, String fromUserName,
+			List<String> Title, List<String> Description, List<String> PicUrl, List<String> Url) {
+		StringBuffer content = new StringBuffer();
+		content.append("<xml><ToUserName><![CDATA[");
+		content.append(toUserName);
+		content.append("]]></ToUserName><FromUserName><![CDATA[");
+		content.append(fromUserName);
+		content.append(
+				"]]></FromUserName><CreateTime>12345678</CreateTime><MsgType><![CDATA[news]]></MsgType><ArticleCount>"
+						+ Title.size() + "</ArticleCount><Articles>");
+		for (int i = 0; i < Url.size(); i++) {
+			content.append("<item>");
+
+			content.append("<Title><![CDATA[");
+			content.append(Title.get(i));
+			content.append("]]></Title>");
+
+			content.append("<Description><![CDATA[");
+			content.append(Description.get(i));
+			content.append("]]></Description>");
+
+			content.append("<PicUrl><![CDATA[");
+			content.append(PicUrl.get(i));
+			content.append("]]></PicUrl>");
+
+			content.append("<Url><![CDATA[");
+			content.append(Url.get(i));
+			content.append("]]></Url>");
+			content.append("</item>");
+		}
+		content.append("</Articles>");
+		content.append("</xml>");
+
+		return content.toString();
+
+	}
+
+	public  String sendtextContent(String ToUserName, String FromUserName, String Content) {
+		StringBuffer buffer = new StringBuffer();
+		log.info(FromUserName + "   " + ToUserName);
+		buffer.append("<xml><ToUserName><![CDATA[");
+		buffer.append(ToUserName);
+		buffer.append("]]></ToUserName><FromUserName><![CDATA[");
+		buffer.append(FromUserName);
+		buffer.append(
+				"]]></FromUserName><CreateTime>12345678</CreateTime><MsgType><![CDATA[text]]></MsgType><Content><![CDATA[");
+		buffer.append(Content);
+		buffer.append("]]></Content></xml>");
+
+		return buffer.toString();
+	}
+
+	// 获取Access_token
+	public synchronized String getAccess_token(String appid, String appsecret)  {
+		// 检查缓存的access_token是否存在且未过期
+		if (StringUtils.isNotEmpty(cachedAccessToken) && System.currentTimeMillis() < accessTokenExpireTime) {
+			return cachedAccessToken;
+		}
+
+		// 如果没有appid或appsecret，使用默认值
+		if (StringUtils.isEmpty(appid)) {
+			appid = gzhappid;
+		}
+		if (StringUtils.isEmpty(appsecret)) {
+			appsecret = gzhappsecret;
+		}
+
+		// 重新获取access_token
+		String url = "https://api.weixin.qq.com/cgi-bin/stable_token";
+		log.info("获取Access_token请求url：" + url);
+		JSONObject sendObject = new JSONObject();
+		sendObject.put("grant_type","client_credential");
+		sendObject.put("appid",appid);
+		sendObject.put("secret",appsecret);
+		sendObject.put("force_refresh",false);
+		String data = httpPost(url,sendObject);
+		log.info("获取Access_token返回数据：" + data);
+		if (StringUtils.isNotEmpty(data)) {
+			JSONObject jsonObject = JSONObject.parseObject(data);
+			// 更新缓存
+			cachedAccessToken = jsonObject.getString("access_token");
+			// 设置过期时间（提前200秒过期）
+			accessTokenExpireTime = System.currentTimeMillis() + (jsonObject.getInteger("expires_in") - 200) * 1000;
+			return cachedAccessToken;
+		}
+		return null;
+	}
+
+	public void createBwwxMenu(String menu) {
+		// 此处改为自己想要的结构体，替换即可
+		String access_token = getAccess_token(null, null);
+
+		String action = "https://api.weixin.qq.com/cgi-bin/menu/create?access_token=" + access_token;
+		try {
+			URL url = new URL(action);
+			HttpURLConnection http = (HttpURLConnection) url.openConnection();
+
+			http.setRequestMethod("POST");
+			http.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+			http.setDoOutput(true);
+			http.setDoInput(true);
+			System.setProperty("sun.net.client.defaultConnectTimeout", "30000");// 连接超时30秒
+			System.setProperty("sun.net.client.defaultReadTimeout", "30000"); // 读取超时30秒
+
+			http.connect();
+			OutputStream os = http.getOutputStream();
+			os.write(menu.getBytes("UTF-8"));// 传入参数
+			os.flush();
+			os.close();
+
+			InputStream is = http.getInputStream();
+			int size = is.available();
+			byte[] jsonBytes = new byte[size];
+			is.read(jsonBytes);
+			String message = new String(jsonBytes, "UTF-8");
+			log.info("createBwwxMenu返回数据：" + message);
+		} catch (Exception e) {
+			log.error("createBwwxMenu出现异常", e);
+		}
+
+	}
+
+	public  String getBasicInfo(String openId) throws Exception {
+		String url = "https://api.weixin.qq.com/cgi-bin/user/info?access_token=" + getAccess_token(appid, appsecret)
+				+ "&openid=" + openId + "&lang=zh_CN";
+		return HttpRequest.get(url).execute().body();
+	}
+
+	public  void createMean(String APPID, String APPSECRET) {
+		String ssms = "http://www.biftsce.com/weixinBf/weixin/allZixun?title=%E6%97%B6%E5%B0%9A%E4%B9%B0%E6%89%8B";
+		String end = "&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
+		String menu = "";
+
+		String zymsUrl = "https://www.fengyoucai.com/weixin/web/newIndex";
+
+		String zyms = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + APPID + "&redirect_uri="
+				+ URLEncoder.encode(zymsUrl) + end;
+		menu = ("{\"button\":[{\"name\":\"个人中心\",\"type\":\"view\",\"url\":\"" + zyms + "\"}]}");
+
+		String access_token = getAccess_token(APPID, APPSECRET);
+
+		String action = "https://api.weixin.qq.com/cgi-bin/menu/create?access_token=" + access_token;
+		try {
+			URL url = new URL(action);
+			HttpURLConnection http = (HttpURLConnection) url.openConnection();
+
+			http.setRequestMethod("POST");
+			http.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+			http.setDoOutput(true);
+			http.setDoInput(true);
+			System.setProperty("sun.net.client.defaultConnectTimeout", "30000");// 连接超时30秒
+			System.setProperty("sun.net.client.defaultReadTimeout", "30000"); // 读取超时30秒
+
+			http.connect();
+			OutputStream os = http.getOutputStream();
+			os.write(menu.getBytes("UTF-8"));// 传入参数
+			os.flush();
+			os.close();
+
+			InputStream is = http.getInputStream();
+			int size = is.available();
+			byte[] jsonBytes = new byte[size];
+			is.read(jsonBytes);
+			String message = new String(jsonBytes, "UTF-8");
+			log.info("createMean返回数据：" + message);
+		} catch (Exception e) {
+			log.error("createMean出现异常", e);
+		}
+	}
+
+	public  void deleteMenu(String string, String string2) {
+		String menu = "{\"button\": [{\"name\": \"照片墙\",\"sub_button\": [{\"type\": \"click\",\"name\": \"我要参与\",\"key\": \"IAMJOIN\"},{\"type\": \"click\",\"name\": \"查看照片墙\",\"key\": \"VIEWPHTOT\"}]},{\"name\": \"有奖互动\", \"sub_button\": [{\"type\": \"click\",\"name\": \"比分竞猜\",\"key\": \"bifenjincai\"},{\"type\": \"click\",\"name\": \"首发预测\", \"key\": \"shoufayuce\"}]},{\"name\": \"球队\",\"sub_button\": [{\"type\": \"click\",\"name\": \"俱乐部\",\"key\": \"julebu\"},{\"type\": \"click\",\"name\": \"球队成员\",\"key\": \"qiuduichengyuan\"},{\"type\": \"click\",\"name\": \"积分榜\",\"key\": \"jifenbang\"},{\"type\": \"click\",\"name\": \"射手榜\",\"key\": \"sheshoubang\"},{\"type\": \"click\",\"name\": \"赛程\",\"key\": \"saicheng\"}]}]}";
+
+		// 此处改为自己想要的结构体，替换即可
+		String access_token = getAccess_token(string, string2);
+
+		String action = "https://api.weixin.qq.com/cgi-bin/menu/delete?access_token=" + access_token;
+		try {
+			URL url = new URL(action);
+			HttpURLConnection http = (HttpURLConnection) url.openConnection();
+
+			http.setRequestMethod("POST");
+			http.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+			http.setDoOutput(true);
+			http.setDoInput(true);
+			System.setProperty("sun.net.client.defaultConnectTimeout", "30000");// 连接超时30秒
+			System.setProperty("sun.net.client.defaultReadTimeout", "30000"); // 读取超时30秒
+
+			http.connect();
+			OutputStream os = http.getOutputStream();
+			os.write(menu.getBytes("UTF-8"));// 传入参数
+			os.flush();
+			os.close();
+
+			InputStream is = http.getInputStream();
+			int size = is.available();
+			byte[] jsonBytes = new byte[size];
+			is.read(jsonBytes);
+			String message = new String(jsonBytes, "UTF-8");
+			log.info("deleteMenu返回数据：" + message);
+		} catch (Exception e) {
+			log.error("deleteMenu出现异常", e);
+		}
+	}
+
+
+
+	// 获取wx名称
+	public  String getWxName(String url) {
+		String nickname = "";
+		try {
+			URL urlGet = new URL(url);
+			HttpURLConnection http = (HttpURLConnection) urlGet.openConnection();
+
+			http.setRequestMethod("GET"); // 必须是get方式请求
+			http.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+			http.setDoOutput(true);
+			http.setDoInput(true);
+			System.setProperty("sun.net.client.defaultConnectTimeout", "30000");// 连接超时30秒
+			System.setProperty("sun.net.client.defaultReadTimeout", "30000"); // 读取超时30秒
+
+			http.connect();
+
+			InputStream is = http.getInputStream();
+			int size = is.available();
+			byte[] jsonBytes = new byte[size];
+			is.read(jsonBytes);
+			nickname = new String(jsonBytes, "UTF-8");
+
+		} catch (Exception e) {
+			log.error("获取微信名称出现异常", e);
+		}
+
+		return nickname;
+	}
+
+	/**
+	 * 获取用户分组
+	 */
+	public  int createGroup(String token, String groupName) {
+		String url = "https://api.weixin.qq.com/cgi-bin/groups/create?access_token=" + token;
+
+		int sb = 0;
+		try {
+			URL urlGet = new URL(url);
+			HttpURLConnection http = (HttpURLConnection) urlGet.openConnection();
+
+			http.setRequestMethod("GET"); // 必须是get方式请求
+			http.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+			http.setDoOutput(true);
+			http.setDoInput(true);
+			System.setProperty("sun.net.client.defaultConnectTimeout", "30000");// 连接超时30秒
+			System.setProperty("sun.net.client.defaultReadTimeout", "30000"); // 读取超时30秒
+
+			http.connect();
+
+			OutputStream outputStream = http.getOutputStream();
+
+			JSONObject jsonObject = new JSONObject();
+			jsonObject.put("name", groupName);
+
+			JSONObject jsonObject2 = new JSONObject();
+			jsonObject2.put("group", jsonObject);
+
+			String json = jsonObject2.toJSONString();
+
+			outputStream.write(json.getBytes("UTF-8"));
+
+			outputStream.flush();
+			outputStream.close();
+
+			InputStream is = http.getInputStream();
+			int size = is.available();
+			byte[] jsonBytes = new byte[size];
+			is.read(jsonBytes);
+			String message = new String(jsonBytes, "UTF-8");
+
+			JSONObject jsObject = JSONObject.parseObject(message);
+
+			log.info("获取用户分组返回数据：" + jsObject);
+
+			jsObject = jsObject.getJSONObject("group");
+
+			sb = jsObject.getInteger("id");
+
+		} catch (Exception e) {
+			log.error("获取用户分组出现异常", e);
+		}
+		return sb;
+	}
+
+	public  int updateGroup(String token, String groupName, int id) {
+		String url = "https://api.weixin.qq.com/cgi-bin/groups/update?access_token=" + token;
+
+		int sb = 0;
+		try {
+			URL urlGet = new URL(url);
+			HttpURLConnection http = (HttpURLConnection) urlGet.openConnection();
+
+			http.setRequestMethod("POST"); // 必须是get方式请求
+			http.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+			http.setDoOutput(true);
+			http.setDoInput(true);
+			System.setProperty("sun.net.client.defaultConnectTimeout", "30000");// 连接超时30秒
+			System.setProperty("sun.net.client.defaultReadTimeout", "30000"); // 读取超时30秒
+
+			http.connect();
+
+			OutputStream outputStream = http.getOutputStream();
+
+			JSONObject jsonObject = new JSONObject();
+			jsonObject.put("name", groupName);
+			jsonObject.put("id", id);
+			JSONObject jsonObject2 = new JSONObject();
+			jsonObject2.put("group", jsonObject);
+			String json = jsonObject.toJSONString();
+
+			outputStream.write(json.getBytes("UTF-8"));
+
+			outputStream.flush();
+			outputStream.close();
+
+			InputStream is = http.getInputStream();
+			int size = is.available();
+			byte[] jsonBytes = new byte[size];
+			is.read(jsonBytes);
+			String message = new String(jsonBytes, "UTF-8");
+
+			JSONObject jsObject = JSONObject.parseObject(message);
+
+			log.info("更新分组返回数据：" + jsObject);
+
+			sb = jsObject.getInteger("errcode");
+
+		} catch (Exception e) {
+			log.error("更新分组出现异常", e);
+		}
+		return sb;
+	}
+
+	public  int updateUsersGroup(String token, String openid, int to_groupid) {
+		String url = "https://api.weixin.qq.com/cgi-bin/groups/members/update?access_token=" + token;
+
+		int sb = 0;
+		try {
+			URL urlGet = new URL(url);
+			HttpURLConnection http = (HttpURLConnection) urlGet.openConnection();
+
+			http.setRequestMethod("POST"); // 必须是get方式请求
+			http.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+			http.setDoOutput(true);
+			http.setDoInput(true);
+			System.setProperty("sun.net.client.defaultConnectTimeout", "30000");// 连接超时30秒
+			System.setProperty("sun.net.client.defaultReadTimeout", "30000"); // 读取超时30秒
+
+			http.connect();
+
+			OutputStream outputStream = http.getOutputStream();
+
+			JSONObject jsonObject = new JSONObject();
+			jsonObject.put("openid", openid);
+			jsonObject.put("to_groupid", to_groupid);
+			String json = jsonObject.toJSONString();
+
+			outputStream.write(json.getBytes("UTF-8"));
+
+			outputStream.flush();
+			outputStream.close();
+
+			InputStream is = http.getInputStream();
+			int size = is.available();
+			byte[] jsonBytes = new byte[size];
+			is.read(jsonBytes);
+			String message = new String(jsonBytes, "UTF-8");
+
+			JSONObject jsObject = JSONObject.parseObject(message);
+
+			log.info("更新用户分组返回数据：" + jsObject);
+
+			sb = jsObject.getInteger("errcode");
+
+		} catch (Exception e) {
+			log.error("更新用户分组出现异常", e);
+		}
+		return sb;
+	}
+
+	public  String crreateTickets(String token) {
+		String url = "https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=" + token;
+
+		String sb = "";
+		try {
+			URL urlGet = new URL(url);
+			HttpURLConnection http = (HttpURLConnection) urlGet.openConnection();
+
+			http.setRequestMethod("GET"); // 必须是get方式请求
+			http.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+			http.setDoOutput(true);
+			http.setDoInput(true);
+			System.setProperty("sun.net.client.defaultConnectTimeout", "30000");// 连接超时30秒
+			System.setProperty("sun.net.client.defaultReadTimeout", "30000"); // 读取超时30秒
+
+			http.connect();
+
+			OutputStream outputStream = http.getOutputStream();
+
+			outputStream.write(("{\"action_name\": \"QR_LIMIT_SCENE\", \"action_info\": {\"scene\": {\"scene_id\": "
+					+ new Random().nextInt(100000) + "}}}").getBytes("UTF-8"));
+
+			outputStream.flush();
+			outputStream.close();
+
+			InputStream is = http.getInputStream();
+			int size = is.available();
+			byte[] jsonBytes = new byte[size];
+			is.read(jsonBytes);
+			String message = new String(jsonBytes, "UTF-8");
+			JSONObject jsObject = JSONObject.parseObject(message);
+			log.info("crreateTickets返回数据：" + jsObject);
+			sb = jsObject.getString("ticket");
+
+		} catch (Exception e) {
+			log.error("crreateTickets出现异常", e);
+		}
+		return sb;
+
+	}
+
+	public  Date getDate(long dateString) {
+		try {
+			return format.parse(format.format(new Date(dateString * 1000L)));
+		} catch (ParseException e) {
+			return new Date();
+		}
+	}
+
+	//
+	public  String getUserInfo(String openid) {
+		String access_token = getAccess_token(appid, appsecret);
+		String url = "https://api.weixin.qq.com/cgi-bin/user/info?access_token=" + access_token + "&openid=" + openid
+				+ "&lang=zh_CN";
+		String data = getWxName(url);
+		log.info("获取用户信息返回数据：" + data);
+		return data;
+	}
+
+	public  String accountAdd(String kf_account, String nickname, String password) {
+		String token = getAccess_token("wx36a52e51c224fd21", "6b9b56dd52bb4885f62c9ac397fb8cfd");
+		String url = "https://api.weixin.qq.com/customservice/kfaccount/add?access_token=" + token;
+
+		String sb = "";
+		try {
+			URL urlGet = new URL(url);
+			HttpURLConnection http = (HttpURLConnection) urlGet.openConnection();
+
+			http.setRequestMethod("POST"); // 必须是get方式请求
+			http.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+			http.setDoOutput(true);
+			http.setDoInput(true);
+			System.setProperty("sun.net.client.defaultConnectTimeout", "30000");// 连接超时30秒
+			System.setProperty("sun.net.client.defaultReadTimeout", "30000"); // 读取超时30秒
+
+			http.connect();
+
+			OutputStream outputStream = http.getOutputStream();
+
+			JSONObject jsonObject = new JSONObject();
+			jsonObject.put("kf_account", kf_account);
+			jsonObject.put("nickname", nickname);
+			jsonObject.put("password", password);
+			String value = jsonObject.toJSONString();
+
+			log.info("accountAdd发送数据：" + value);
+			outputStream.write((value).getBytes("UTF-8"));
+
+			outputStream.flush();
+			outputStream.close();
+
+			InputStream is = http.getInputStream();
+			int size = is.available();
+			byte[] jsonBytes = new byte[size];
+			is.read(jsonBytes);
+			String message = new String(jsonBytes, "UTF-8");
+
+			JSONObject jsObject = JSONObject.parseObject (message);
+
+			log.info("accountAdd返回数据：" + jsObject);
+
+			sb = jsObject.getString("ticket");
+		} catch (Exception e) {
+			log.error("accountAdd出现异常", e);
+		}
+		return sb;
+
+	}
+
+	public  String getTitcket() throws Exception {
+		String accessToken = getAccess_token(gzhappid, gzhappsecret);
+		String url = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=" + accessToken + "&type=jsapi";
+		String returnValue = httpGet(url,null);
+		JSONObject jsonObject = JSONObject.parseObject(returnValue);
+		String ticket = jsonObject.getString("ticket");
+		log.info("getTitcket返回数据：" + jsonObject);
+		return ticket;
+	}
+
+	// 获取带参数二维码
+	public  String getQrcode() {
+		String accessToken = getAccess_token(appid, appsecret);
+		return crreateTickets(accessToken);
+	}
+
+	public  String jmsq() throws Exception {
+		String url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + appid
+				+ "&redirect_uri=http://dya.s1.natapp.cc&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect";
+		String returnValue = httpGet(url,null);
+		JSONObject jsonObject = JSONObject.parseObject(returnValue);
+		log.info("jmsq返回数据：" + jsonObject);
+		return "jsonObject";
+	}
+
+	public  String getRandomStr(int length) {
+		String base = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+		Random random = new Random();
+		StringBuffer sb = new StringBuffer();
+		for (int i = 0; i < length; i++) {
+			int number = random.nextInt(base.length());
+			sb.append(base.charAt(number));
+		}
+		return sb.toString();
+
+	}
+
+
+
+	public  String httpPost(String url,JSONObject params){
+		HttpResponse response = HttpRequest.post(url)
+				.header("Content-Type", "application/json;charset=UTF-8")
+				.body(String.valueOf(params))
+				.timeout(5 * 60 * 1000)
+				.execute();
+		return response.body();
+	}
+
+	public  String httpGet(String url,JSONObject params){
+		HttpResponse response = HttpRequest.get(url)
+				.header("Content-Type", "application/json;charset=UTF-8")
+				.body(String.valueOf(params))
+				.timeout(5 * 60 * 1000)
+				.execute();
+		return response.body();
+	}
+
+
+
+	/**
+	 * <br>
+	 * 描述：微信公众号发送模板消息 <br>
+	 * 接口文档：https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751277
+	 *
+	 * @param openId openId，微信登录返回的openId
+	 * @return
+	 * @throws Exception
+	 * @date: 2019年9月5日 下午2:45:19
+	 * @author Tjw
+	 */
+	public  boolean sendMessage(JSONObject jsonObject, String openId, String templateId, String path)
+			 {
+		if (!StringUtils.isEmpty(openId)) {
+			String access_token = getAccessToken();
+			String url = " https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+access_token;
+			JSONObject params = new JSONObject();
+			params.put("touser", openId);
+			params.put("template_id", templateId);
+			params.put("url",url);
+			params.put("data", jsonObject);
+			JSONObject miniprogram = new JSONObject();
+			miniprogram.put("appid",appid);
+			miniprogram.put("pagepath",path);
+			params.put("miniprogram",miniprogram);
+			log.info("微信公众号发送模板消息请求参数：" + params.toString());
+			String data = httpPost(url, params);
+			log.info("微信公众号发送模板消息返回数据：" + data);
+			JSONObject dataMap = JSONObject.parseObject(data);
+			if (dataMap != null && dataMap.get("errcode") != null
+					&& Integer.parseInt(dataMap.get("errcode").toString()) == 0) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	public static void main(String[] args) {
+
+//		System.out.println("token:"+getAccessToken());
+	}
+
+}
+
+
+
+
+