feat:

修改租户管理相关代码

admin/src/views/pm/pmowner/pmowner-add-and-update.vue

@@ -81,7 +81,7 @@
     </span>
 
     <!-- 租户弹窗 -->
-    <tenant-add-and-update ref="tenantAddOrUpdate" :ownerId="dataForm.id" @refreshDataList="getTenantList"></tenant-add-and-update>
+    <tenant-add-and-update ref="tenantAddOrUpdate" :ownerId="dataForm.id" @refreshDataList="getTenantList" @saveTenant="saveTenant"></tenant-add-and-update>
   </el-dialog>
 </template>
 
@@ -90,6 +90,7 @@
   import * as deptApi from '@/api/sysdept.js'
   import * as tenantApi from '@/api/pmtenant.js'
   import * as houseApi from '@/api/pmhouse.js'
+  import * as rentRecordApi from '@/api/pmtenanthouse.js'
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import TenantAddAndUpdate from './tenant-add-and-update.vue'
@@ -120,6 +121,9 @@
           ownerName: [
             { required: true, message: '业主姓名  为必填项', trigger: 'blur' }
           ],
+          deptId: [
+            { required: true, message: '部门  为必填项', trigger: 'blur' }
+          ],
           ownerType: [
             { required: true, message: '业主类型  为必填项', trigger: 'blur' }
           ],
@@ -150,6 +154,7 @@
         tenantApi.pmtenantListByOwnerIdApi(this.dataForm.id, { page: 1, limit: 9999 }).then(res => {
           try {
             this.tenantList = Array.isArray(res) ? res : (res.list || [])
+            this.loadRentRecordsForTenants()
           } catch (error) {
             this.tenantList = []
           }
@@ -157,6 +162,36 @@
           this.tenantList = []
         })
       },
+      // 加载租户的租赁记录
+      loadRentRecordsForTenants() {
+        this.tenantList.forEach(tenant => {
+          if (tenant.id) {
+            rentRecordApi.pmtenanthouseListApi({ rentId: tenant.id, page: 1, limit: 9999 }).then(res => {
+              try {
+                tenant.pmTenantHouses = Array.isArray(res) ? res : (res.list || [])
+              } catch (error) {
+                tenant.pmTenantHouses = []
+              }
+            }).catch(err => {
+              tenant.pmTenantHouses = []
+            })
+          } else {
+            tenant.pmTenantHouses = []
+          }
+        })
+      },
+      // 保存租户（从租户弹窗接收）
+      saveTenant(tenantData) {
+        if (!tenantData) return
+
+        const existingIndex = this.tenantList.findIndex(tenant => tenant.id === tenantData.id)
+
+        if (existingIndex !== -1) {
+          this.tenantList.splice(existingIndex, 1, tenantData)
+        } else {
+          this.tenantList.push(tenantData)
+        }
+      },
       // 添加租户
       addTenant() {
         if (this.$refs.tenantAddOrUpdate) {
@@ -212,8 +247,13 @@
           if (this.dataForm.id) {
             api.pmownerDetailApi(id).then(function(res) {
               this.dataForm = res;
-              // 获取该业主的租户列表
+              // 如果后端返回了租户列表，直接使用
-              this.getTenantList()
+              if (res.pmTenants && res.pmTenants.length > 0) {
+                this.tenantList = res.pmTenants
+              } else {
+                // 否则通过API获取租户列表
+                this.getTenantList()
+              }
             }.bind(this))
           } else {
             // 新增时清空租户列表
@@ -225,14 +265,41 @@
       dataSubmit () {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            const submitData = {
+              id: this.dataForm.id,
+              ownerName: this.dataForm.ownerName,
+              ownerType: this.dataForm.ownerType,
+              ownerIdcard: this.dataForm.ownerIdcard,
+              phone: this.dataForm.phone,
+              email: this.dataForm.email,
+              emergencyContact: this.dataForm.emergencyContact,
+              emergencyPhone: this.dataForm.emergencyPhone,
+              status: this.dataForm.status,
+              deptId: this.dataForm.deptId,
+              houseId: this.dataForm.houseId,
+              remark: this.dataForm.remark,
+              pmTenants: this.tenantList.map(tenant => ({
+                id: tenant.id,
+                tenantName: tenant.tenantName,
+                tenantType: tenant.tenantType,
+                idCard: tenant.idCard,
+                phome: tenant.phome,
+                company: tenant.company,
+                status: tenant.status,
+                remark: tenant.remark,
+                tenantId: tenant.tenantId,
+                pmTenantHouses: tenant.pmTenantHouses || []
+              }))
+            }
+
             if (this.dataForm.id) {
-              api.pmownerUpdateApi(this.dataForm).then(function(res) {
+              api.pmownerUpdateApi(submitData).then(function(res) {
                 this.$message.success('保存成功')
                 this.visible = false
                 this.$emit('refreshDataList')
               }.bind(this));
             } else {
-              api.pmownerCreateApi(this.dataForm).then(function(res) {
+              api.pmownerCreateApi(submitData).then(function(res) {
                 this.$message.success('新增成功')
                 this.visible = false
                 this.$emit('refreshDataList')

admin/src/views/pm/pmowner/rent-record-add-and-update.vue

@@ -4,14 +4,14 @@
       :title="!dataForm.id ? '添加' : '修改'"
       :close-on-click-modal="false"
       :visible.sync="visible"
-      :z-index="3000">
+      :z-index="2000">
     <!-- 新增和修改表单 -->
     <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="选择绑定时间" 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%"></el-date-picker>
       </el-form-item>
       <el-form-item label="解绑时间" prop="rentEndTime">
-        <el-date-picker v-model="dataForm.rentEndTime" type="datetime" placeholder="选择解绑时间" 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%"></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>

admin/src/views/pm/pmowner/tenant-add-and-update.vue

@@ -28,14 +28,13 @@
       <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>
 
-
     <!-- 租赁记录列表 -->
     <div class="rent-records-container">
       <el-table :data="rentRecords" style="width: 100%">
@@ -195,36 +194,23 @@
       dataSubmit () {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
-            if (this.dataForm.id) {
+            const tenantData = {
-              api.pmtenantUpdateApi(this.dataForm).then(() => {
+              id: this.dataForm.id,
-                this.$message.success('保存成功')
+              tenantName: this.dataForm.tenantName,
-                this.visible = false
+              tenantType: this.dataForm.tenantType,
-                this.$emit('refreshDataList')
+              idCard: this.dataForm.idCard,
-              })
+              phome: this.dataForm.phome,
-            } else {
+              company: this.dataForm.company,
-              api.pmtenantCreateApi(this.dataForm).then(res => {
+              status: this.dataForm.status,
-                const tenantId = res.id
+              remark: this.dataForm.remark,
-                if (tenantId && this.ownerId) {
+              tenantId: this.dataForm.tenantId,
-                  const relData = {
+              pmTenantHouses: this.rentRecords
-                    tenantHouseId: tenantId,
-                    ownerId: this.ownerId,
-                    tenantId: this.dataForm.tenantId,
-                    delFlag: '0'
-                  }
-                  relApi.pmtentanthouserelCreateApi(relData).then(() => {
-                    this.$message.success('新增成功')
-                    this.visible = false
-                    this.$emit('refreshDataList')
-                  }).catch(() => {
-                    this.$message.error('关联关系创建失败')
-                  })
-                } else {
-                  this.$message.success('新增成功')
-                  this.visible = false
-                  this.$emit('refreshDataList')
-                }
-              })
             }
+
+            this.$emit('saveTenant', tenantData)
+            this.$message.success('保存成功')
+            this.visible = false
+            this.$emit('refreshDataList')
           }
         })
       }

crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/EbUserController.java

@@ -0,0 +1,309 @@
+package com.zbkj.modules.autogencode.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zbkj.common.model.user.User;
+import com.zbkj.common.request.PageParamRequest;
+import com.zbkj.common.response.CommonResult;
+import com.zbkj.common.page.CommonPage;
+import com.zbkj.service.service.UserService;
+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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+
+
+
+/**
+ * 用户表 控制器
+ */
+@RestController
+@RequestMapping("api/autogencode/ebuser")
+public class EbUserController {
+    @Autowired
+    private UserService ebUserService;
+
+
+
+    /**
+     * 条件设置
+     * 根据实体类字段自动生成查询条件
+     */
+    private void condition(LambdaQueryWrapper<User> queryWrapper, User request) {
+        if (request == null) {
+            return;
+        }
+        
+        // 根据实体类字段自动生成查询条件
+            
+        // 用户id
+        if (request.getUid() != null) {
+            queryWrapper.eq(User::getUid, request.getUid());
+        }
+                    
+        // 用户账号
+        if (StrUtil.isNotBlank(request.getAccount())) {
+            queryWrapper.eq(User::getAccount, request.getAccount());
+        }
+                    
+        // 用户密码
+        if (StrUtil.isNotBlank(request.getPwd())) {
+            queryWrapper.eq(User::getPwd, request.getPwd());
+        }
+                    
+        // 真实姓名
+        if (StrUtil.isNotBlank(request.getRealName())) {
+            queryWrapper.eq(User::getRealName, request.getRealName());
+        }
+                    
+        // 生日
+        if (StrUtil.isNotBlank(request.getBirthday())) {
+            queryWrapper.eq(User::getBirthday, request.getBirthday());
+        }
+                    
+        // 身份证号码
+        if (StrUtil.isNotBlank(request.getCardId())) {
+            queryWrapper.eq(User::getCardId, request.getCardId());
+        }
+                    
+        // 用户备注
+        if (StrUtil.isNotBlank(request.getMark())) {
+            queryWrapper.eq(User::getMark, request.getMark());
+        }
+                    
+        // 合伙人id
+        if (request.getPartnerId() != null) {
+            queryWrapper.eq(User::getPartnerId, request.getPartnerId());
+        }
+                    
+        // 用户分组id
+        if (StrUtil.isNotBlank(request.getGroupId())) {
+            queryWrapper.eq(User::getGroupId, request.getGroupId());
+        }
+                    
+        // 标签id
+        if (StrUtil.isNotBlank(request.getTagId())) {
+            queryWrapper.eq(User::getTagId, request.getTagId());
+        }
+                    
+        // 用户昵称
+        if (StrUtil.isNotBlank(request.getNickname())) {
+            queryWrapper.eq(User::getNickname, request.getNickname());
+        }
+                    
+        // 用户头像
+        if (StrUtil.isNotBlank(request.getAvatar())) {
+            queryWrapper.eq(User::getAvatar, request.getAvatar());
+        }
+                    
+        // 手机号码
+        if (StrUtil.isNotBlank(request.getPhone())) {
+            queryWrapper.eq(User::getPhone, request.getPhone());
+        }
+                    
+        // 添加ip
+        if (StrUtil.isNotBlank(request.getAddIp())) {
+            queryWrapper.eq(User::getAddIp, request.getAddIp());
+        }
+                    
+        // 最后一次登录ip
+        if (StrUtil.isNotBlank(request.getLastIp())) {
+            queryWrapper.eq(User::getLastIp, request.getLastIp());
+        }
+                    
+        // 用户余额
+        if (request.getNowMoney() != null) {
+            queryWrapper.eq(User::getNowMoney, request.getNowMoney());
+        }
+                    
+        // 佣金金额
+        if (request.getBrokeragePrice() != null) {
+            queryWrapper.eq(User::getBrokeragePrice, request.getBrokeragePrice());
+        }
+                    
+        // 用户剩余积分
+        if (request.getIntegral() != null) {
+            queryWrapper.eq(User::getIntegral, request.getIntegral());
+        }
+                    
+        // 用户剩余经验
+        if (request.getExperience() != null) {
+            queryWrapper.eq(User::getExperience, request.getExperience());
+        }
+                    
+        // 连续签到天数
+        if (request.getSignNum() != null) {
+            queryWrapper.eq(User::getSignNum, request.getSignNum());
+        }
+                    
+        // 1为正常，0为禁止
+        if (request.getStatus() != null) {
+            queryWrapper.eq(User::getStatus, request.getStatus());
+        }
+                    
+        // 等级
+        if (request.getLevel() != null) {
+            queryWrapper.eq(User::getLevel, request.getLevel());
+        }
+                    
+        // 推广员id
+        if (request.getSpreadUid() != null) {
+            queryWrapper.eq(User::getSpreadUid, request.getSpreadUid());
+        }
+                    
+        // 推广员关联时间
+        if (request.getSpreadTime() != null) {
+            queryWrapper.eq(User::getSpreadTime, request.getSpreadTime());
+        }
+                    
+        // 用户类型
+        if (StrUtil.isNotBlank(request.getUserType())) {
+            queryWrapper.eq(User::getUserType, request.getUserType());
+        }
+                    
+        // 是否为推广员
+        if (request.getIsPromoter() != null) {
+            queryWrapper.eq(User::getIsPromoter, request.getIsPromoter());
+        }
+                    
+        // 用户购买次数
+        if (request.getPayCount() != null) {
+            queryWrapper.eq(User::getPayCount, request.getPayCount());
+        }
+                    
+        // 下级人数
+        if (request.getSpreadCount() != null) {
+            queryWrapper.eq(User::getSpreadCount, request.getSpreadCount());
+        }
+                    
+        // 详细地址
+        if (StrUtil.isNotBlank(request.getAddres())) {
+            queryWrapper.eq(User::getAddres, request.getAddres());
+        }
+                    
+        // 管理员编号 
+        if (request.getAdminid() != null) {
+            queryWrapper.eq(User::getAdminid, request.getAdminid());
+        }
+                    
+        // 用户登陆类型，h5,wechat,routine
+        if (StrUtil.isNotBlank(request.getLoginType())) {
+            queryWrapper.eq(User::getLoginType, request.getLoginType());
+        }
+                    
+        // 创建时间
+        if (request.getCreateTime() != null) {
+            queryWrapper.eq(User::getCreateTime, request.getCreateTime());
+        }
+                    
+        // 更新时间
+        if (request.getUpdateTime() != null) {
+            queryWrapper.eq(User::getUpdateTime, request.getUpdateTime());
+        }
+                    
+        // 最后一次登录时间
+        if (request.getLastLoginTime() != null) {
+            queryWrapper.eq(User::getLastLoginTime, request.getLastLoginTime());
+        }
+                    
+        // 清除时间
+        if (request.getCleanTime() != null) {
+            queryWrapper.eq(User::getCleanTime, request.getCleanTime());
+        }
+                    
+        // 推广等级记录
+        if (StrUtil.isNotBlank(request.getPath())) {
+            queryWrapper.eq(User::getPath, request.getPath());
+        }
+                    
+        // 是否关注公众号
+        if (request.getSubscribe() != null) {
+            queryWrapper.eq(User::getSubscribe, request.getSubscribe());
+        }
+                    
+
+        // 国家，中国CN，其他OTHER
+        if (StrUtil.isNotBlank(request.getCountry())) {
+            queryWrapper.eq(User::getCountry, request.getCountry());
+        }
+                    
+        // 成为分销员时间
+        if (request.getPromoterTime() != null) {
+            queryWrapper.eq(User::getPromoterTime, request.getPromoterTime());
+        }
+            
+    }
+
+
+    /**
+     * 分页显示用户表
+     * @param request 搜索条件
+     * @param pageParamRequest 分页参数
+     */
+    @ApiOperation(value = "分页列表")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public CommonResult<CommonPage<User>>  getList(@Validated User request, @Validated PageParamRequest pageParamRequest) {
+        LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper();
+
+        // 应用搜索条件
+        condition(queryWrapper, request);
+
+        CommonPage<User> page = CommonPage.restPage(ebUserService.pageList(queryWrapper, pageParamRequest));
+        return CommonResult.success(page);
+    }
+
+
+    /**
+     * 详情数据
+     */
+    @RequestMapping(value = "/info/{uid}", method = RequestMethod.GET)
+    public CommonResult<User> info(@PathVariable("uid") Integer uid){
+		User ebUser = ebUserService.getById(uid);
+
+        return CommonResult.success(ebUser);
+    }
+
+    /**
+     * 新增数据
+     */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    public CommonResult<String> save(@RequestBody User ebUser){
+        if (ebUserService.save(ebUser)) {
+            return CommonResult.success();
+        }
+        return CommonResult.failed();
+    }
+
+    /**
+     * 修改数据
+     */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    public CommonResult<String> update(@RequestBody User ebUser){
+        if (ebUserService.updateById(ebUser)) {
+            return CommonResult.success();
+        }
+        return CommonResult.failed();
+    }
+
+    /**
+     * 删除:根据id集合
+     */
+    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    public CommonResult<String> delete(@RequestBody Integer[] uids){
+        if (ebUserService.removeByIds(Arrays.asList(uids))) {
+            return CommonResult.success();
+        }
+        return CommonResult.failed();
+    }
+
+}

crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmOwnerController.java

@@ -26,6 +26,12 @@ import com.zbkj.common.model.system.SysDept;
 import com.zbkj.service.service.SysDeptService;
 import com.zbkj.modules.autogencode.entity.PmOwnerHouseRel;
 import com.zbkj.modules.autogencode.service.PmOwnerHouseRelService;
+import com.zbkj.modules.autogencode.entity.PmTenant;
+import com.zbkj.modules.autogencode.service.PmTenantService;
+import com.zbkj.modules.autogencode.entity.PmTenantHouse;
+import com.zbkj.modules.autogencode.service.PmTenantHouseService;
+import com.zbkj.modules.autogencode.entity.PmTenantHouseRel;
+import com.zbkj.modules.autogencode.service.PmTenantHouseRelService;
 
 
 
@@ -45,6 +51,15 @@ public class PmOwnerController {
     @Autowired
     private PmOwnerHouseRelService pmOwnerHouseRelService;
 
+    @Autowired
+    private PmTenantService pmTenantService;
+
+    @Autowired
+    private PmTenantHouseService pmTenantHouseService;
+
+    @Autowired
+    private PmTenantHouseRelService pmTenantHouseRelService;
+
 
 
     /**
@@ -228,7 +243,6 @@ public class PmOwnerController {
     public CommonResult<PmOwner> info(@PathVariable("id") Long id){
 		PmOwner pmOwner = pmOwnerService.getById(id);
         
-        // 查询业主房屋关联关系
         if (pmOwner != null) {
             LambdaQueryWrapper<PmOwnerHouseRel> relQueryWrapper = new LambdaQueryWrapper<>();
             relQueryWrapper.eq(PmOwnerHouseRel::getOwnerId, id);
@@ -237,6 +251,25 @@ public class PmOwnerController {
             if (rels != null && !rels.isEmpty()) {
                 pmOwner.setHouseId(rels.get(0).getHouseId());
             }
+
+            LambdaQueryWrapper<PmTenantHouseRel> tenantRelQueryWrapper = new LambdaQueryWrapper<>();
+            tenantRelQueryWrapper.eq(PmTenantHouseRel::getOwnerId, id);
+            List<PmTenantHouseRel> tenantRels = pmTenantHouseRelService.list(tenantRelQueryWrapper);
+
+            if (tenantRels != null && !tenantRels.isEmpty()) {
+                List<PmTenant> tenantList = new ArrayList<>();
+                for (PmTenantHouseRel tenantRel : tenantRels) {
+                    PmTenant tenant = pmTenantService.getById(tenantRel.getTenantHouseId());
+                    if (tenant != null) {
+                        LambdaQueryWrapper<PmTenantHouse> houseQueryWrapper = new LambdaQueryWrapper<>();
+                        houseQueryWrapper.eq(PmTenantHouse::getRentId, tenant.getId());
+                        List<PmTenantHouse> tenantHouses = pmTenantHouseService.list(houseQueryWrapper);
+                        tenant.setPmTenantHouses(tenantHouses);
+                        tenantList.add(tenant);
+                    }
+                }
+                pmOwner.setPmTenants(tenantList);
+            }
         }
 
         return CommonResult.success(pmOwner);
@@ -248,15 +281,38 @@ public class PmOwnerController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public CommonResult<String> save(@RequestBody PmOwner pmOwner){
         if (pmOwnerService.save(pmOwner)) {
-            // 如果选择了房屋，创建业主房屋关联关系
+            Long ownerId = pmOwner.getId();
+
             if (pmOwner.getHouseId() != null) {
                 PmOwnerHouseRel rel = new PmOwnerHouseRel();
-                rel.setOwnerId(pmOwner.getId());
+                rel.setOwnerId(ownerId);
                 rel.setHouseId(pmOwner.getHouseId());
                 rel.setRelType("1");
                 rel.setBindTime(new java.util.Date());
                 pmOwnerHouseRelService.save(rel);
             }
+
+            if (pmOwner.getPmTenants() != null && !pmOwner.getPmTenants().isEmpty()) {
+                for (PmTenant tenant : pmOwner.getPmTenants()) {
+                    if (pmTenantService.save(tenant)) {
+                        Long tenantId = tenant.getId();
+
+                        PmTenantHouseRel tenantHouseRel = new PmTenantHouseRel();
+                        tenantHouseRel.setTenantHouseId(tenantId);
+                        tenantHouseRel.setOwnerId(ownerId);
+                        tenantHouseRel.setTenantId(tenant.getTenantId());
+                        tenantHouseRel.setDelFlag("0");
+                        pmTenantHouseRelService.save(tenantHouseRel);
+
+                        if (tenant.getPmTenantHouses() != null && !tenant.getPmTenantHouses().isEmpty()) {
+                            for (PmTenantHouse tenantHouse : tenant.getPmTenantHouses()) {
+                                tenantHouse.setRentId(tenantId);
+                                pmTenantHouseService.save(tenantHouse);
+                            }
+                        }
+                    }
+                }
+            }
             return CommonResult.success();
         }
         return CommonResult.failed();
@@ -268,35 +324,80 @@ public class PmOwnerController {
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     public CommonResult<String> update(@RequestBody PmOwner pmOwner){
         if (pmOwnerService.updateById(pmOwner)) {
-            // 处理业主房屋关联关系
+            Long ownerId = pmOwner.getId();
+
             LambdaQueryWrapper<PmOwnerHouseRel> relQueryWrapper = new LambdaQueryWrapper<>();
-            relQueryWrapper.eq(PmOwnerHouseRel::getOwnerId, pmOwner.getId());
+            relQueryWrapper.eq(PmOwnerHouseRel::getOwnerId, ownerId);
             List<PmOwnerHouseRel> existingRels = pmOwnerHouseRelService.list(relQueryWrapper);
             
             if (pmOwner.getHouseId() != null) {
-                // 如果选择了房屋
                 if (existingRels != null && !existingRels.isEmpty()) {
-                    // 更新现有的关联关系
                     PmOwnerHouseRel existingRel = existingRels.get(0);
                     existingRel.setHouseId(pmOwner.getHouseId());
                     existingRel.setRelType("1");
                     existingRel.setBindTime(new java.util.Date());
                     pmOwnerHouseRelService.updateById(existingRel);
                 } else {
-                    // 创建新的关联关系
                     PmOwnerHouseRel rel = new PmOwnerHouseRel();
-                    rel.setOwnerId(pmOwner.getId());
+                    rel.setOwnerId(ownerId);
                     rel.setHouseId(pmOwner.getHouseId());
                     rel.setRelType("1");
                     rel.setBindTime(new java.util.Date());
                     pmOwnerHouseRelService.save(rel);
                 }
             } else {
-                // 如果没有选择房屋，删除现有的关联关系
                 if (existingRels != null && !existingRels.isEmpty()) {
                     pmOwnerHouseRelService.removeByIds(existingRels.stream().map(PmOwnerHouseRel::getId).collect(java.util.stream.Collectors.toList()));
                 }
             }
+
+            if (pmOwner.getPmTenants() != null && !pmOwner.getPmTenants().isEmpty()) {
+                for (PmTenant tenant : pmOwner.getPmTenants()) {
+                    if (tenant.getId() != null) {
+                        pmTenantService.updateById(tenant);
+                    } else {
+                        pmTenantService.save(tenant);
+                    }
+
+                    Long tenantId = tenant.getId();
+
+                    LambdaQueryWrapper<PmTenantHouseRel> tenantRelQueryWrapper = new LambdaQueryWrapper<>();
+                    tenantRelQueryWrapper.eq(PmTenantHouseRel::getTenantHouseId, tenantId);
+                    tenantRelQueryWrapper.eq(PmTenantHouseRel::getOwnerId, ownerId);
+                    List<PmTenantHouseRel> existingTenantRels = pmTenantHouseRelService.list(tenantRelQueryWrapper);
+                    
+                    if (existingTenantRels == null || existingTenantRels.isEmpty()) {
+                        PmTenantHouseRel tenantHouseRel = new PmTenantHouseRel();
+                        tenantHouseRel.setTenantHouseId(tenantId);
+                        tenantHouseRel.setOwnerId(ownerId);
+                        tenantHouseRel.setTenantId(tenant.getTenantId());
+                        tenantHouseRel.setDelFlag("0");
+                        pmTenantHouseRelService.save(tenantHouseRel);
+                    }
+
+                    if (tenant.getPmTenantHouses() != null && !tenant.getPmTenantHouses().isEmpty()) {
+                        for (PmTenantHouse tenantHouse : tenant.getPmTenantHouses()) {
+                            if (tenantHouse.getId() != null) {
+                                PmTenantHouse existingHouse = pmTenantHouseService.getById(tenantHouse.getId());
+                                if (existingHouse != null) {
+                                    existingHouse.setRentId(tenantId);
+                                    existingHouse.setRentBeginTime(tenantHouse.getRentBeginTime());
+                                    existingHouse.setRentEndTime(tenantHouse.getRentEndTime());
+                                    existingHouse.setDepositAmount(tenantHouse.getDepositAmount());
+                                    existingHouse.setRentAmount(tenantHouse.getRentAmount());
+                                    existingHouse.setAuthScope(tenantHouse.getAuthScope());
+                                    existingHouse.setStatus(tenantHouse.getStatus());
+                                    existingHouse.setRemark(tenantHouse.getRemark());
+                                    pmTenantHouseService.updateById(existingHouse);
+                                }
+                            } else {
+                                tenantHouse.setRentId(tenantId);
+                                pmTenantHouseService.save(tenantHouse);
+                            }
+                        }
+                    }
+                }
+            }
             return CommonResult.success();
         }
         return CommonResult.failed();

crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmOwner.java

@@ -4,10 +4,12 @@ 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.zbkj.modules.autogencode.entity.PmTenant;
 import io.swagger.annotations.ApiModelProperty;
 
 	import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 import lombok.Data;
 
 
@@ -116,4 +118,11 @@ public class PmOwner implements Serializable {
 	@ApiModelProperty(value = "租户ID")
 	private String tenantId;
 
+	/**
+	 * 租户列表（不映射到数据库）
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "租户列表")
+	private List<PmTenant> pmTenants;
+
 }

crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmTenant.java

@@ -1,12 +1,15 @@
 package com.zbkj.modules.autogencode.entity;
 
 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.zbkj.modules.autogencode.entity.PmTenantHouse;
 import io.swagger.annotations.ApiModelProperty;
 
 	import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 import lombok.Data;
 
 
@@ -92,4 +95,11 @@ public class PmTenant implements Serializable {
 	@ApiModelProperty(value = "租户ID")
 	private String tenantId;
 
+	/**
+	 * 租赁记录列表（不映射到数据库）
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "租赁记录列表")
+	private List<PmTenantHouse> pmTenantHouses;
+
 }

crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmTenantHouse.java

@@ -3,99 +3,104 @@ package com.zbkj.modules.autogencode.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 
-	import java.math.BigDecimal;
+import java.math.BigDecimal;
-	import java.io.Serializable;
+import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 
 @Data
 @TableName("pm_tenant_house")
 public class PmTenantHouse 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 rentId;
+    /**
+     * 绑定时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @ApiModelProperty(value = "绑定时间")
+    private Date rentBeginTime;
+    /**
+     * 解绑时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @ApiModelProperty(value = "解绑时间")
+    private Date rentEndTime;
+    /**
+     * 押金金额
+     */
+    @ApiModelProperty(value = "押金金额")
+    private BigDecimal depositAmount;
+    /**
+     * 月租金
+     */
+    @ApiModelProperty(value = "月租金")
+    private BigDecimal rentAmount;
+    /**
+     * 授权范围
+     */
+    @ApiModelProperty(value = "授权范围")
+    private String authScope;
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态")
+    private String status;
+    /**
+     * 备注
+     */
+    @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 rentId;
-	/**
-		 * 绑定时间
-	 */
-	@ApiModelProperty(value = "绑定时间")
-	private Date rentBeginTime;
-	/**
-		 * 解绑时间
-	 */
-	@ApiModelProperty(value = "解绑时间")
-	private Date rentEndTime;
-	/**
-		 * 押金金额
-	 */
-	@ApiModelProperty(value = "押金金额")
-	private BigDecimal depositAmount;
-	/**
-		 * 月租金
-	 */
-	@ApiModelProperty(value = "月租金")
-	private BigDecimal rentAmount;
-	/**
-		 * 授权范围
-	 */
-	@ApiModelProperty(value = "授权范围")
-	private String authScope;
-	/**
-		 * 状态
-	 */
-	@ApiModelProperty(value = "状态")
-	private String status;
-	/**
-		 * 备注
-	 */
-	@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;
 
 }

crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/User.java

@@ -156,4 +156,12 @@ public class User implements Serializable {
 
     @ApiModelProperty(value = "成为分销员时间")
     private Date promoterTime;
+
+    @ApiModelProperty(value = "员工类型")
+    private String staffType;
+
+    @ApiModelProperty(value = "业主/租户Id")
+    private Long ownerTenantId;
+
+
 }

crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserService.java

@@ -1,5 +1,6 @@
 package com.zbkj.service.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.zbkj.common.model.user.User;
@@ -25,6 +26,13 @@ import java.util.Map;
  */
 public interface UserService extends IService<User> {
 
+    /**
+     * EbUser 列表查询
+     * @param pageParamRequest 分页参数对象
+     * @return
+     */
+    List<User> pageList(LambdaQueryWrapper<User> queryWrapper, PageParamRequest pageParamRequest);
+
     /**
      * 用户分页列表
      * @param request 查询参数

crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java

@@ -123,6 +123,18 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
     @Autowired
     private SystemAttachmentService systemAttachmentService;
 
+    /**
+     * 带分页参数的列表查询实现
+     */
+    @Override
+    public List<User> pageList(LambdaQueryWrapper<User> queryWrapper, PageParamRequest pageParamRequest) {
+
+        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
+
+        return userDao.selectList(queryWrapper);
+    }
+
+
     /**
      * 分页显示用户表
      *