1、地址修改为三级联动

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/controller/EmployAddressController.java

@@ -39,14 +39,14 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 地址表
  * @Author: jeecg-boot
- * @Date:   2024-12-22
+ * @Date:   2025-07-01
  * @Version: V1.0
  */
 @Api(tags="地址表")
 @RestController
 @RequestMapping("/employAddress/employAddress")
 @Slf4j
-public class EmployAddressController extends JeecgController<EmployAddress, IEmployAddressService> {
+public class EmployAddressController extends JeecgController<EmployAddress, IEmployAddressService>{
 	@Autowired
 	private IEmployAddressService employAddressService;
 	
@@ -61,16 +61,74 @@ public class EmployAddressController extends JeecgController<EmployAddress, IEmp
 	 */
 	//@AutoLog(value = "地址表-分页列表查询")
 	@ApiOperation(value="地址表-分页列表查询", notes="地址表-分页列表查询")
-	@GetMapping(value = "/list")
+	@GetMapping(value = "/rootList")
 	public Result<IPage<EmployAddress>> queryPageList(EmployAddress employAddress,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
+		String hasQuery = req.getParameter("hasQuery");
+        if(hasQuery != null && "true".equals(hasQuery)){
+            QueryWrapper<EmployAddress> queryWrapper =  QueryGenerator.initQueryWrapper(employAddress, req.getParameterMap());
+            List<EmployAddress> list = employAddressService.queryTreeListNoPage(queryWrapper);
+            IPage<EmployAddress> pageList = new Page<>(1, 10, list.size());
+            pageList.setRecords(list);
+            return Result.OK(pageList);
+        }else{
+            String parentId = employAddress.getPid();
+            if (oConvertUtils.isEmpty(parentId)) {
+                parentId = "0";
+            }
+            employAddress.setPid(null);
+            QueryWrapper<EmployAddress> queryWrapper = QueryGenerator.initQueryWrapper(employAddress, req.getParameterMap());
+            // 使用 eq 防止模糊查询
+            queryWrapper.eq("pid", parentId);
+            Page<EmployAddress> page = new Page<EmployAddress>(pageNo, pageSize);
+            IPage<EmployAddress> pageList = employAddressService.page(page, queryWrapper);
+            return Result.OK(pageList);
+        }
+	}
+
+	 /**
+      * 获取子数据
+      * @param employAddress
+      * @param req
+      * @return
+      */
+	//@AutoLog(value = "地址表-获取子数据")
+	@ApiOperation(value="地址表-获取子数据", notes="地址表-获取子数据")
+	@GetMapping(value = "/childList")
+	public Result<IPage<EmployAddress>> queryPageList(EmployAddress employAddress,HttpServletRequest req) {
 		QueryWrapper<EmployAddress> queryWrapper = QueryGenerator.initQueryWrapper(employAddress, req.getParameterMap());
-		Page<EmployAddress> page = new Page<EmployAddress>(pageNo, pageSize);
-		IPage<EmployAddress> pageList = employAddressService.page(page, queryWrapper);
+		List<EmployAddress> list = employAddressService.list(queryWrapper);
+		IPage<EmployAddress> pageList = new Page<>(1, 10, list.size());
+        pageList.setRecords(list);
 		return Result.OK(pageList);
 	}
+
+    /**
+      * 批量查询子节点
+      * @param parentIds 父ID（多个采用半角逗号分割）
+      * @return 返回 IPage
+      * @param parentIds
+      * @return
+      */
+	//@AutoLog(value = "地址表-批量获取子数据")
+    @ApiOperation(value="地址表-批量获取子数据", notes="地址表-批量获取子数据")
+    @GetMapping("/getChildListBatch")
+    public Result getChildListBatch(@RequestParam("parentIds") String parentIds) {
+        try {
+            QueryWrapper<EmployAddress> queryWrapper = new QueryWrapper<>();
+            List<String> parentIdList = Arrays.asList(parentIds.split(","));
+            queryWrapper.in("pid", parentIdList);
+            List<EmployAddress> list = employAddressService.list(queryWrapper);
+            IPage<EmployAddress> pageList = new Page<>(1, 10, list.size());
+            pageList.setRecords(list);
+            return Result.OK(pageList);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return Result.error("批量查询子节点失败：" + e.getMessage());
+        }
+    }
 	
 	/**
 	 *   添加
@@ -82,7 +140,7 @@ public class EmployAddressController extends JeecgController<EmployAddress, IEmp
 	@ApiOperation(value="地址表-添加", notes="地址表-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody EmployAddress employAddress) {
-		employAddressService.save(employAddress);
+		employAddressService.addEmployAddress(employAddress);
 		return Result.OK("添加成功！");
 	}
 	
@@ -96,7 +154,7 @@ public class EmployAddressController extends JeecgController<EmployAddress, IEmp
 	@ApiOperation(value="地址表-编辑", notes="地址表-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody EmployAddress employAddress) {
-		employAddressService.updateById(employAddress);
+		employAddressService.updateEmployAddress(employAddress);
 		return Result.OK("编辑成功!");
 	}
 	
@@ -110,7 +168,7 @@ public class EmployAddressController extends JeecgController<EmployAddress, IEmp
 	@ApiOperation(value="地址表-通过id删除", notes="地址表-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		employAddressService.removeById(id);
+		employAddressService.deleteEmployAddress(id);
 		return Result.OK("删除成功!");
 	}
 	
@@ -125,7 +183,7 @@ public class EmployAddressController extends JeecgController<EmployAddress, IEmp
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.employAddressService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
+		return Result.OK("批量删除成功！");
 	}
 	
 	/**
@@ -153,7 +211,7 @@ public class EmployAddressController extends JeecgController<EmployAddress, IEmp
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, EmployAddress employAddress) {
-        return super.exportXls(request, employAddress, EmployAddress.class, "地址表");
+		return super.exportXls(request, employAddress, EmployAddress.class, "地址表");
     }
 
     /**
@@ -165,7 +223,7 @@ public class EmployAddressController extends JeecgController<EmployAddress, IEmp
     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, EmployAddress.class);
+		return super.importExcel(request, response, EmployAddress.class);
     }
 
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/entity/EmployAddress.java

@@ -1,7 +1,6 @@
 package org.jeecg.modules.employAddress.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -14,19 +13,16 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+import java.io.UnsupportedEncodingException;
 
 /**
  * @Description: 地址表
  * @Author: jeecg-boot
- * @Date:   2024-12-22
+ * @Date:   2025-07-01
  * @Version: V1.0
  */
 @Data
 @TableName("employ_address")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
 @ApiModel(value="employ_address对象", description="地址表")
 public class EmployAddress implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -51,4 +47,13 @@ public class EmployAddress implements Serializable {
 	@Excel(name = "地址", width = 15)
     @ApiModelProperty(value = "地址")
     private java.lang.String adress;
+	/**父级节点*/
+	@Excel(name = "父级节点", width = 15)
+    @ApiModelProperty(value = "父级节点")
+    private java.lang.String pid;
+	/**是否有子节点*/
+	@Excel(name = "是否有子节点", width = 15, dicCode = "yn")
+	@Dict(dicCode = "yn")
+    @ApiModelProperty(value = "是否有子节点")
+    private java.lang.String hasChild;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/EmployAddressMapper.java

@@ -1,7 +1,5 @@
 package org.jeecg.modules.employAddress.mapper;
 
-import java.util.List;
-
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.employAddress.entity.EmployAddress;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -9,9 +7,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 地址表
  * @Author: jeecg-boot
- * @Date:   2024-12-22
+ * @Date:   2025-07-01
  * @Version: V1.0
  */
 public interface EmployAddressMapper extends BaseMapper<EmployAddress> {
 
+	/**
+	 * 编辑节点状态
+	 * @param id
+	 * @param status
+	 */
+	void updateTreeNodeStatus(@Param("id") String id,@Param("status") String status);
+
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/xml/EmployAddressMapper.xml

@@ -2,4 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.employAddress.mapper.EmployAddressMapper">
 
+	<update id="updateTreeNodeStatus" parameterType="java.lang.String">
+		update employ_address set has_child = #{status} where id = #{id}
+	</update>
+
 </mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/IEmployAddressService.java

@@ -2,13 +2,37 @@ package org.jeecg.modules.employAddress.service;
 
 import org.jeecg.modules.employAddress.entity.EmployAddress;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.exception.JeecgBootException;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.util.List;
 
 /**
  * @Description: 地址表
  * @Author: jeecg-boot
- * @Date:   2024-12-22
+ * @Date:   2025-07-01
  * @Version: V1.0
  */
 public interface IEmployAddressService extends IService<EmployAddress> {
 
+	/**根节点父ID的值*/
+	public static final String ROOT_PID_VALUE = "0";
+	
+	/**树节点有子节点状态值*/
+	public static final String HASCHILD = "1";
+	
+	/**树节点无子节点状态值*/
+	public static final String NOCHILD = "0";
+
+	/**新增节点*/
+	void addEmployAddress(EmployAddress employAddress);
+	
+	/**修改节点*/
+	void updateEmployAddress(EmployAddress employAddress) throws JeecgBootException;
+	
+	/**删除节点*/
+	void deleteEmployAddress(String id) throws JeecgBootException;
+
+	/**查询所有数据，无分页*/
+    List<EmployAddress> queryTreeListNoPage(QueryWrapper<EmployAddress> queryWrapper);
+
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/impl/EmployAddressServiceImpl.java

@@ -1,19 +1,191 @@
 package org.jeecg.modules.employAddress.service.impl;
 
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.employAddress.entity.EmployAddress;
 import org.jeecg.modules.employAddress.mapper.EmployAddressMapper;
 import org.jeecg.modules.employAddress.service.IEmployAddressService;
 import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * @Description: 地址表
  * @Author: jeecg-boot
- * @Date:   2024-12-22
+ * @Date:   2025-07-01
  * @Version: V1.0
  */
 @Service
 public class EmployAddressServiceImpl extends ServiceImpl<EmployAddressMapper, EmployAddress> implements IEmployAddressService {
 
+	@Override
+	public void addEmployAddress(EmployAddress employAddress) {
+	   //新增时设置hasChild为0
+	    employAddress.setHasChild(IEmployAddressService.NOCHILD);
+		if(oConvertUtils.isEmpty(employAddress.getPid())){
+			employAddress.setPid(IEmployAddressService.ROOT_PID_VALUE);
+		}else{
+			//如果当前节点父ID不为空 则设置父节点的hasChildren 为1
+			EmployAddress parent = baseMapper.selectById(employAddress.getPid());
+			if(parent!=null && !"1".equals(parent.getHasChild())){
+				parent.setHasChild("1");
+				baseMapper.updateById(parent);
+			}
+		}
+		baseMapper.insert(employAddress);
+	}
+	
+	@Override
+	public void updateEmployAddress(EmployAddress employAddress) {
+		EmployAddress entity = this.getById(employAddress.getId());
+		if(entity==null) {
+			throw new JeecgBootException("未找到对应实体");
+		}
+		String old_pid = entity.getPid();
+		String new_pid = employAddress.getPid();
+		if(!old_pid.equals(new_pid)) {
+			updateOldParentNode(old_pid);
+			if(oConvertUtils.isEmpty(new_pid)){
+				employAddress.setPid(IEmployAddressService.ROOT_PID_VALUE);
+			}
+			if(!IEmployAddressService.ROOT_PID_VALUE.equals(employAddress.getPid())) {
+				baseMapper.updateTreeNodeStatus(employAddress.getPid(), IEmployAddressService.HASCHILD);
+			}
+		}
+		baseMapper.updateById(employAddress);
+	}
+	
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void deleteEmployAddress(String id) throws JeecgBootException {
+		//查询选中节点下所有子节点一并删除
+        id = this.queryTreeChildIds(id);
+        if(id.indexOf(",")>0) {
+            StringBuffer sb = new StringBuffer();
+            String[] idArr = id.split(",");
+            for (String idVal : idArr) {
+                if(idVal != null){
+                    EmployAddress employAddress = this.getById(idVal);
+                    String pidVal = employAddress.getPid();
+                    //查询此节点上一级是否还有其他子节点
+                    List<EmployAddress> dataList = baseMapper.selectList(new QueryWrapper<EmployAddress>().eq("pid", pidVal).notIn("id",Arrays.asList(idArr)));
+                    if((dataList == null || dataList.size()==0) && !Arrays.asList(idArr).contains(pidVal)
+                            && !sb.toString().contains(pidVal)){
+                        //如果当前节点原本有子节点 现在木有了，更新状态
+                        sb.append(pidVal).append(",");
+                    }
+                }
+            }
+            //批量删除节点
+            baseMapper.deleteBatchIds(Arrays.asList(idArr));
+            //修改已无子节点的标识
+            String[] pidArr = sb.toString().split(",");
+            for(String pid : pidArr){
+                this.updateOldParentNode(pid);
+            }
+        }else{
+            EmployAddress employAddress = this.getById(id);
+            if(employAddress==null) {
+                throw new JeecgBootException("未找到对应实体");
+            }
+            updateOldParentNode(employAddress.getPid());
+            baseMapper.deleteById(id);
+        }
+	}
+	
+	@Override
+    public List<EmployAddress> queryTreeListNoPage(QueryWrapper<EmployAddress> queryWrapper) {
+        List<EmployAddress> dataList = baseMapper.selectList(queryWrapper);
+        List<EmployAddress> mapList = new ArrayList<>();
+        for(EmployAddress data : dataList){
+            String pidVal = data.getPid();
+            //递归查询子节点的根节点
+            if(pidVal != null && !"0".equals(pidVal)){
+                EmployAddress rootVal = this.getTreeRoot(pidVal);
+                if(rootVal != null && !mapList.contains(rootVal)){
+                    mapList.add(rootVal);
+                }
+            }else{
+                if(!mapList.contains(data)){
+                    mapList.add(data);
+                }
+            }
+        }
+        return mapList;
+    }
+	
+	/**
+	 * 根据所传pid查询旧的父级节点的子节点并修改相应状态值
+	 * @param pid
+	 */
+	private void updateOldParentNode(String pid) {
+		if(!IEmployAddressService.ROOT_PID_VALUE.equals(pid)) {
+			Integer count = Math.toIntExact(baseMapper.selectCount(new QueryWrapper<EmployAddress>().eq("pid", pid)));
+			if(count==null || count<=1) {
+				baseMapper.updateTreeNodeStatus(pid, IEmployAddressService.NOCHILD);
+			}
+		}
+	}
+
+	/**
+     * 递归查询节点的根节点
+     * @param pidVal
+     * @return
+     */
+    private EmployAddress getTreeRoot(String pidVal){
+        EmployAddress data =  baseMapper.selectById(pidVal);
+        if(data != null && !"0".equals(data.getPid())){
+            return this.getTreeRoot(data.getPid());
+        }else{
+            return data;
+        }
+    }
+
+    /**
+     * 根据id查询所有子节点id
+     * @param ids
+     * @return
+     */
+    private String queryTreeChildIds(String ids) {
+        //获取id数组
+        String[] idArr = ids.split(",");
+        StringBuffer sb = new StringBuffer();
+        for (String pidVal : idArr) {
+            if(pidVal != null){
+                if(!sb.toString().contains(pidVal)){
+                    if(sb.toString().length() > 0){
+                        sb.append(",");
+                    }
+                    sb.append(pidVal);
+                    this.getTreeChildIds(pidVal,sb);
+                }
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 递归查询所有子节点
+     * @param pidVal
+     * @param sb
+     * @return
+     */
+    private StringBuffer getTreeChildIds(String pidVal,StringBuffer sb){
+        List<EmployAddress> dataList = baseMapper.selectList(new QueryWrapper<EmployAddress>().eq("pid", pidVal));
+        if(dataList != null && dataList.size()>0){
+            for(EmployAddress tree : dataList) {
+                if(!sb.toString().contains(tree.getId())){
+                    sb.append(",").append(tree.getId());
+                }
+                this.getTreeChildIds(tree.getId(),sb);
+            }
+        }
+        return sb;
+    }
+
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/EmployAddressList.vue

@@ -51,20 +51,18 @@
       <a-table
         ref="table"
         size="middle"
-        :scroll="{x:true}"
-        bordered
         rowKey="id"
+        class="j-table-force-nowrap"
+        :scroll="{x:true}"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
+        :expandedRowKeys="expandedRowKeys"
+        @change="handleTableChange"
+        @expand="handleExpand"
+        v-bind="tableProps">
 
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
         <template slot="imgSlot" slot-scope="text,record">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
           <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
@@ -90,10 +88,10 @@
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
               <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
+                <a @click="handleAddChild(record)">添加下级</a>
               </a-menu-item>
               <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteNode(record.id)" placement="topLeft">
                   <a>删除</a>
                 </a-popconfirm>
               </a-menu-item>
@@ -104,20 +102,21 @@
       </a-table>
     </div>
 
-    <employ-address-modal ref="modalForm" @ok="modalFormOk"></employ-address-modal>
+    <employAddress-modal ref="modalForm" @ok="modalFormOk"></employAddress-modal>
   </a-card>
 </template>
 
 <script>
 
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
+  import { getAction, deleteAction } from '@/api/manage'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import EmployAddressModal from './modules/EmployAddressModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import { filterObj } from '@/utils/util';
 
   export default {
-    name: 'EmployAddressList',
-    mixins:[JeecgListMixin, mixinDevice],
+    name: "EmployAddressList",
+    mixins:[JeecgListMixin],
     components: {
       EmployAddressModal
     },
@@ -126,19 +125,9 @@
         description: '地址表管理页面',
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           {
             title:'地址',
-            align:"center",
+            align:"left",
             dataIndex: 'adress'
           },
           {
@@ -147,35 +136,222 @@
             align:"center",
             fixed:"right",
             width:147,
-            scopedSlots: { customRender: 'action' }
+            scopedSlots: { customRender: 'action' },
           }
         ],
         url: {
-          list: "/employAddress/employAddress/list",
+          list: "/employAddress/employAddress/rootList",
+          childList: "/employAddress/employAddress/childList",
+          getChildListBatch: "/employAddress/employAddress/getChildListBatch",
           delete: "/employAddress/employAddress/delete",
           deleteBatch: "/employAddress/employAddress/deleteBatch",
           exportXlsUrl: "/employAddress/employAddress/exportXls",
           importExcelUrl: "employAddress/employAddress/importExcel",
-          
         },
-        dictOptions:{},
+        expandedRowKeys:[],
+        hasChildrenField:"hasChild",
+        pidField:"pid",
+        dictOptions: {},
+        loadParent: false,
         superFieldList:[],
       }
     },
     created() {
-    this.getSuperFieldList();
+      this.getSuperFieldList();
     },
     computed: {
-      importExcelUrl: function(){
+      importExcelUrl(){
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
       },
+      tableProps() {
+        let _this = this
+        return {
+          // 列表项是否可选择
+          rowSelection: {
+            selectedRowKeys: _this.selectedRowKeys,
+            onChange: (selectedRowKeys) => _this.selectedRowKeys = selectedRowKeys
+          }
+        }
+      }
     },
     methods: {
-      initDictConfig(){
+      loadData(arg){
+        if(arg==1){
+          this.ipagination.current=1
+        }
+        this.loading = true
+        let params = this.getQueryParams()
+        params.hasQuery = 'true'
+        getAction(this.url.list,params).then(res=>{
+          if(res.success){
+            let result = res.result
+            if(Number(result.total)>0){
+              this.ipagination.total = Number(result.total)
+              this.dataSource = this.getDataByResult(res.result.records)
+              return this.loadDataByExpandedRows(this.dataSource)
+            }else{
+              this.ipagination.total=0
+              this.dataSource=[]
+            }
+          }else{
+            this.$message.warning(res.message)
+          }
+        }).finally(()=>{
+          this.loading = false
+        })
+      },
+      // 根据已展开的行查询数据（用于保存后刷新时异步加载子级的数据）
+      loadDataByExpandedRows(dataList) {
+        if (this.expandedRowKeys.length > 0) {
+          return getAction(this.url.getChildListBatch,{ parentIds: this.expandedRowKeys.join(',') }).then(res=>{
+            if (res.success && res.result.records.length>0) {
+              //已展开的数据批量子节点
+              let records = res.result.records
+              const listMap = new Map();
+              for (let item of records) {
+                let pid = item[this.pidField];
+                if (this.expandedRowKeys.join(',').includes(pid)) {
+                 let mapList = listMap.get(pid);
+                  if (mapList == null) {
+                    mapList = [];
+                  }
+                  mapList.push(item);
+                  listMap.set(pid, mapList);
+                }
+              }
+              let childrenMap = listMap;
+              let fn = (list) => {
+                if(list) {
+                  list.forEach(data => {
+                    if (this.expandedRowKeys.includes(data.id)) {
+                      data.children = this.getDataByResult(childrenMap.get(data.id))
+                      fn(data.children)
+                    }
+                  })
+                }
+              }
+              fn(dataList)
+            }
+          })
+        } else {
+          return Promise.resolve()
+        }
+      },
+      getQueryParams(arg) {
+        //获取查询条件
+        let sqp = {}
+        let param = {}
+        if(this.superQueryParams){
+          sqp['superQueryParams']=encodeURI(this.superQueryParams)
+          sqp['superQueryMatchType'] = this.superQueryMatchType
+        }
+        if(arg){
+          param = Object.assign(sqp, this.isorter ,this.filters);
+        }else{
+          param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
+        }
+        if(JSON.stringify(this.queryParam) === "{}" || arg){
+          param.hasQuery = 'false'
+        }else{
+          param.hasQuery = 'true'
+        }
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        return filterObj(param);
+      },
+      searchReset() {
+        //重置
+        this.expandedRowKeys = []
+        this.queryParam = {}
+        this.loadData(1);
+      },
+      getDataByResult(result){
+        if(result){
+          return result.map(item=>{
+            //判断是否标记了带有子节点
+            if(item[this.hasChildrenField]=='1'){
+              let loadChild = { id: item.id+'_loadChild', name: 'loading...', isLoading: true }
+              item.children = [loadChild]
+            }
+            return item
+          })
+        }
+      },
+      handleExpand(expanded, record){
+        // 判断是否是展开状态
+        if (expanded) {
+          this.expandedRowKeys.push(record.id)
+          if (record.children.length>0 && record.children[0].isLoading === true) {
+            let params = this.getQueryParams(1);//查询条件
+            params[this.pidField] = record.id
+            params.hasQuery = 'false'
+            params.superQueryParams=""
+            getAction(this.url.childList,params).then((res)=>{
+              if(res.success){
+                if(res.result.records){
+                  record.children = this.getDataByResult(res.result.records)
+                  this.dataSource = [...this.dataSource]
+                }else{
+                  record.children=''
+                  record.hasChildrenField='0'
+                }
+              }else{
+                this.$message.warning(res.message)
+              }
+            })
+          }
+        }else{
+          let keyIndex = this.expandedRowKeys.indexOf(record.id)
+          if(keyIndex>=0){
+            this.expandedRowKeys.splice(keyIndex, 1);
+          }
+        }
+      },
+      handleAddChild(record){
+        this.loadParent = true
+        let obj = {}
+        obj[this.pidField] = record['id']
+        this.$refs.modalForm.add(obj);
+      },
+      handleDeleteNode(id) {
+        if(!this.url.delete){
+          this.$message.error("请设置url.delete属性!")
+          return
+        }
+        var that = this;
+        deleteAction(that.url.delete, {id: id}).then((res) => {
+          if (res.success) {
+             that.loadData(1)
+          } else {
+            that.$message.warning(res.message);
+          }
+        });
+      },
+      batchDel(){
+        if(this.selectedRowKeys.length<=0){
+          this.$message.warning('请选择一条记录！');
+          return false;
+        }else{
+          let ids = "";
+          let that = this;
+          that.selectedRowKeys.forEach(function(val) {
+            ids+=val+",";
+          });
+          that.$confirm({
+            title:"确认删除",
+            content:"是否删除选中数据?",
+            onOk: function(){
+              that.handleDeleteNode(ids)
+              that.onClearSelected();
+            }
+          });
+        }
       },
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'adress',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'pid',text:'父级节点',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/modules/EmployAddressModal.vue

@@ -3,58 +3,151 @@
     :title="title"
     :width="width"
     :visible="visible"
+    :confirmLoading="confirmLoading"
     switchFullscreen
     @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <employ-address-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></employ-address-form>
+    <a-spin :spinning="confirmLoading">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
+        <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="adress">
+          <a-input v-model="model.adress" placeholder="请输入地址" ></a-input>
+        </a-form-model-item>
+        <a-form-model-item label="父级节点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
+          <j-tree-select
+            ref="treeSelect"
+            placeholder="请选择父级节点"
+            v-model="model.pid"
+            dict="employ_address,adress,id"
+            pidField="pid"
+            pidValue="0"
+            hasChildField="has_child"
+            >
+          </j-tree-select>
+        </a-form-model-item>
+        
+      </a-form-model>
+    </a-spin>
   </j-modal>
 </template>
 
 <script>
 
-  import EmployAddressForm from './EmployAddressForm'
+  import { httpAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
   export default {
-    name: 'EmployAddressModal',
-    components: {
-      EmployAddressForm
+    name: "EmployAddressModal",
+    components: { 
     },
     data () {
       return {
-        title:'',
+        title:"操作",
         width:800,
         visible: false,
-        disableSubmit: false
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/employAddress/employAddress/add",
+          edit: "/employAddress/employAddress/edit",
+        },
+        expandedRowKeys:[],
+        pidField:"pid"
+     
       }
     },
+    created () {
+       //备份model原始值
+       this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
     methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
+      add (obj) {
+        this.modelDefault.pid=''
+        this.edit(Object.assign(this.modelDefault , obj));
       },
       edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
+        this.model = Object.assign({}, record);
+        this.visible = true;
       },
       close () {
         this.$emit('close');
         this.visible = false;
+        this.$refs.form.clearValidate()
       },
       handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
+        const that = this;
+        // 触发表单验证
+       this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+             if(this.model.id && this.model.id === this.model[this.pidField]){
+              that.$message.warning("父级节点不能选择自己");
+              that.confirmLoading = false;
+              return;
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                this.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }else{
+             return false
+          }
+        })
       },
       handleCancel () {
         this.close()
+      },
+      submitSuccess(formData,flag){
+        if(!formData.id){
+          let treeData = this.$refs.treeSelect.getCurrTreeData()
+          this.expandedRowKeys=[]
+          this.getExpandKeysByPid(formData[this.pidField],treeData,treeData)
+          this.$emit('ok',formData,this.expandedRowKeys.reverse());
+        }else{
+          this.$emit('ok',formData,flag);
+        }
+      },
+      getExpandKeysByPid(pid,arr,all){
+        if(pid && arr && arr.length>0){
+          for(let i=0;i<arr.length;i++){
+            if(arr[i].key==pid){
+              this.expandedRowKeys.push(arr[i].key)
+              this.getExpandKeysByPid(arr[i]['parentId'],all,all)
+            }else{
+              this.getExpandKeysByPid(pid,arr[i].children,all)
+            }
+          }
+        }
       }
+      
+      
     }
   }
 </script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.api.ts

@@ -1,14 +1,17 @@
-import {defHttp} from '/@/utils/http/axios';
+import {defHttp} from "/@/utils/http/axios";
 import {Modal} from 'ant-design-vue';
 
 enum Api {
-  list = '/employAddress/employAddress/list',
+  list = '/employAddress/employAddress/rootList',
   save='/employAddress/employAddress/add',
   edit='/employAddress/employAddress/edit',
-  deleteOne = '/employAddress/employAddress/delete',
+  deleteEmployAddress = '/sys/employAddress/delete',
   deleteBatch = '/employAddress/employAddress/deleteBatch',
   importExcel = '/employAddress/employAddress/importExcel',
   exportXls = '/employAddress/employAddress/exportXls',
+  loadTreeData = '/employAddress/employAddress/loadTreeRoot',
+  getChildList = '/employAddress/employAddress/childList',
+  getChildListBatch = '/employAddress/employAddress/getChildListBatch',
 }
 /**
  * 导出api
@@ -17,6 +20,7 @@ enum Api {
 export const getExportUrl = Api.exportXls;
 /**
  * 导入api
+ * @param params
  */
 export const getImportUrl = Api.importExcel;
 /**
@@ -25,12 +29,11 @@ export const getImportUrl = Api.importExcel;
  */
 export const list = (params) =>
   defHttp.get({url: Api.list, params});
-
 /**
- * 删除单个
+ * 删除
  */
-export const deleteOne = (params,handleSuccess) => {
-  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+export const deleteEmployAddress = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteEmployAddress, params}, {joinParamsToUrl: true}).then(() => {
     handleSuccess();
   });
 }
@@ -38,7 +41,7 @@ export const deleteOne = (params,handleSuccess) => {
  * 批量删除
  * @param params
  */
-export const batchDelete = (params, handleSuccess) => {
+export const batchDeleteEmployAddress = (params, handleSuccess) => {
   Modal.confirm({
     title: '确认删除',
     content: '是否删除选中数据',
@@ -55,7 +58,25 @@ export const batchDelete = (params, handleSuccess) => {
  * 保存或者更新
  * @param params
  */
-export const saveOrUpdate = (params, isUpdate) => {
+export const saveOrUpdateDict = (params, isUpdate) => {
   let url = isUpdate ? Api.edit : Api.save;
   return defHttp.post({url: url, params});
 }
+/**
+ * 查询全部树形节点数据
+ * @param params
+ */
+export const loadTreeData = (params) =>
+  defHttp.get({url: Api.loadTreeData,params});
+/**
+ * 查询子节点数据
+ * @param params
+ */
+export const getChildList = (params) =>
+  defHttp.get({url: Api.getChildList, params});
+/**
+ * 批量查询子节点数据
+ * @param params
+ */
+export const getChildListBatch = (params) =>
+  defHttp.get({url: Api.getChildListBatch, params},{isTransformResponse:false});

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.data.ts

@@ -17,7 +17,7 @@ export const searchFormSchema: FormSchema[] = [
       field: "adress",
       component: 'Input',
       colProps: {span: 6},
- 	},
+     },
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -26,4 +26,9 @@ export const formSchema: FormSchema[] = [
     field: 'adress',
     component: 'Input',
   },
+  {
+    label: '父级节点',
+    field: 'pid',
+    component: 'Input',
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddressList.vue

@@ -1,162 +1,272 @@
 <template>
-  <div>
+  <div class="p-4">
     <!--引用表格-->
-   <BasicTable @register="registerTable" :rowSelection="rowSelection">
-     <!--插槽:table标题-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand" @fetch-success="onFetchSuccess">
+      <!--插槽:table标题-->
       <template #tableTitle>
-          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button type="primary" @click="handleCreate" preIcon="ant-design:plus-outlined"> 新增</a-button>
           <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
           <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-          <a-dropdown v-if="checkedKeys.length > 0">
-              <template #overlay>
-                <a-menu>
-                  <a-menu-item key="1" @click="batchHandleDelete">
-                    <Icon icon="ant-design:delete-outlined"></Icon>
-                    删除
-                  </a-menu-item>
-                </a-menu>
-              </template>
-              <a-button>批量操作
-                <Icon icon="mdi:chevron-down"></Icon>
-              </a-button>
+
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button>批量操作
+            <Icon icon="ant-design:down-outlined"></Icon>
+          </a-button>
         </a-dropdown>
       </template>
-       <!--操作栏-->
+      <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
-      </template>
-      <!--字段回显插槽-->
-      <template #htmlSlot="{text}">
-         <div v-html="text"></div>
-      </template>
-      <template #fileSlot="{text}">
-         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+        <TableAction :actions="getTableAction(record)"/>
       </template>
     </BasicTable>
-    <!-- 表单区域 -->
-    <EmployAddressModal @register="registerModal" @success="handleSuccess"></EmployAddressModal>
+    <!--字典弹窗-->
+    <EmployAddressModal @register="registerModal" @success="handleSuccess"/>
   </div>
 </template>
 
 <script lang="ts" name="employAddress-employAddress" setup>
-  import {ref, computed, unref} from 'vue';
-  import {BasicTable, useTable, TableAction} from '/@/components/Table';
-  import {useModal} from '/@/components/Modal';
+  //ts语法
+  import {ref, computed, unref, toRaw, nextTick} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/src/components/Table';
+  import {useModal} from '/src/components/Modal';
   import { useListPage } from '/@/hooks/system/useListPage'
-  import EmployAddressModal from './components/EmployAddressModal.vue'
-  import {columns, searchFormSchema} from './employAddress.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './employAddress.api';
-  const checkedKeys = ref<Array<string | number>>([]);
-  //注册model
+  import EmployAddressModal from './components/EmployAddressModal.vue';
+  import {columns} from './EmployAddress.data';
+  import {list, deleteEmployAddress, batchDeleteEmployAddress, getExportUrl,getImportUrl, getChildList,getChildListBatch} from './EmployAddress.api';
+
+  const expandedRowKeys = ref([]);
+  //字典model
   const [registerModal, {openModal}] = useModal();
-  //注册table数据
+   //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-      tableProps:{
-           title: '地址表',
-           api: list,
-           columns,
-           canResize:false,
-           formConfig: {
-              labelWidth: 120,
-              schemas: searchFormSchema,
-              autoSubmitOnEnter:true,
-              showAdvancedButton:true,
-              fieldMapToTime: [
-              ],
-            },
-           actionColumn: {
-               width: 120,
-            },
-      },
-       exportConfig: {
-            name:"地址表",
-            url: getExportUrl,
+    tableProps:{
+         title: '地址表',
+         columns,
+         canResize:false,
+         actionColumn: {
+             width: 120,
           },
-          importConfig: {
-            url: getImportUrl
-          },
-  })
+    },
+     exportConfig: {
+          name:"地址表",
+          url: getExportUrl,
+        },
+        importConfig: {
+          url: getImportUrl,
+          success: importSuccess
+        },
+    })
 
-  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+  const [registerTable, {reload, collapseAll, updateTableDataRecord, findTableDataRecord,getDataSource},{ rowSelection, selectedRowKeys }] = tableContext
 
-   /**
-    * 新增事件
-    */
-  function handleAdd() {
-     openModal(true, {
-       isUpdate: false,
-       showFooter: true,
-     });
+  /**
+   * 新增事件
+   */
+  function handleCreate() {
+    openModal(true, {
+      isUpdate: false,
+    });
   }
-   /**
-    * 编辑事件
-    */
-  function handleEdit(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: true,
-     });
-   }
-   /**
-    * 详情
+
+  /**
+   * 编辑事件
+   */
+  async function handleEdit(record) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+    });
+  }
+
+  /**
+   * 详情
+   */
+  async function handleDetail(record) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+      hideFooter: true,
+    });
+  }
+
+  /**
+   * 删除事件
    */
-  function handleDetail(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: false,
-     });
-   }
-   /**
-    * 删除事件
-    */
   async function handleDelete(record) {
-     await deleteOne({id: record.id}, reload);
-   }
-   /**
-    * 批量删除事件
-    */
+    await deleteEmployAddress({id: record.id}, importSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
   async function batchHandleDelete() {
-     await batchDelete({ids: checkedKeys.value}, reload);
-   }
-   /**
-    * 成功回调
-    */
-  function handleSuccess() {
-      reload();
-   }
-   /**
-      * 操作栏
-      */
-  function getTableAction(record){
-       return [
-         {
-           label: '编辑',
-           onClick: handleEdit.bind(null, record),
-         }
-       ]
-   }
-     /**
-        * 下拉操作栏
-        */
-  function getDropDownAction(record){
-      return [
-           {
-             label: '详情',
-             onClick: handleDetail.bind(null, record),
-           }, {
-             label: '删除',
-             popConfirm: {
-               title: '是否确认删除',
-               confirm: handleDelete.bind(null, record),
-             }
-           }
-      ]
-   }
+    const ids = selectedRowKeys.value.filter(item => !item.includes('loading'))
+    await batchDeleteEmployAddress({ids: ids}, importSuccess);
+  }
+  /**
+   * 导入
+   */
+   function importSuccess() {
+    reload() && (expandedRowKeys.value = []);
+  }
+  /**
+   * 添加下级
+   */
+  function handleAddSub(record) {
+    openModal(true, {
+      record,
+      isUpdate: false,
+    });
+  }
+  /**
+   * 成功回调
+   */
+  async function handleSuccess({isUpdate, values, expandedArr}) {
+    if (isUpdate) {
+      //编辑回调
+      updateTableDataRecord(values.id, values);
+    } else {
+        if(!values['pid']){
+            //新增根节点
+            reload();
+        }else{
+            //新增子集
+            expandedRowKeys.value = [];
+            for (let key of unref(expandedArr)) {
+                await expandTreeNode(key)
+            }
+        }
+    }
+  }
+
+  /**
+   * 接口请求成功后回调
+   */
+  function onFetchSuccess(result) {
+      getDataByResult(result.items)&&loadDataByExpandedRows();
+  }
+  /**
+   * 根据已展开的行查询数据（用于保存后刷新时异步加载子级的数据）
+   */
+  async function loadDataByExpandedRows() {
+      if (unref(expandedRowKeys).length > 0) {
+          const res = await getChildListBatch({ parentIds: unref(expandedRowKeys).join(',')});
+          if (res.success && res.result.records.length>0) {
+              //已展开的数据批量子节点
+              let records = res.result.records
+              const listMap = new Map();
+              for (let item of records) {
+                  let pid = item['pid'];
+                  if (unref(expandedRowKeys).includes(pid)) {
+                      let mapList = listMap.get(pid);
+                      if (mapList == null) {
+                          mapList = [];
+                      }
+                      mapList.push(item);
+                      listMap.set(pid, mapList);
+                  }
+              }
+              let childrenMap = listMap;
+              let fn = (list) => {
+                  if(list) {
+                      list.forEach(data => {
+                          if (unref(expandedRowKeys).includes(data.id)) {
+                              data.children = getDataByResult(childrenMap.get(data.id))
+                              fn(data.children)
+                          }
+                      })
+                  }
+              };
+              fn(getDataSource())
+          }
+      }
+  }
+  /**
+   * 处理数据集
+   */
+  function getDataByResult(result){
+      if(result && result.length>0){
+          return result.map(item=>{
+              //判断是否标记了带有子节点
+              if(item["hasChild"]=='1'){
+                  let loadChild = { id: item.id+'_loadChild', name: 'loading...', isLoading: true }
+                  item.children = [loadChild]
+              }
+              return item
+          })
+      }
+  }
+  /**
+   *树节点展开合并
+   * */
+  async function handleExpand(expanded, record) {
+    // 判断是否是展开状态，展开状态(expanded)并且存在子集(children)并且未加载过(isLoading)的就去查询子节点数据
+    if (expanded) {
+       expandedRowKeys.value.push(record.id)
+      if (record.children.length > 0 && !!record.children[0].isLoading) {
+        let result = await getChildList({pid: record.id});
+        result=result.records?result.records:result;
+        if (result && result.length > 0) {
+          record.children = getDataByResult(result);
+        } else {
+          record.children = null
+          record.hasChild = '0'
+        }
+      }
+    } else {
+      let keyIndex = expandedRowKeys.value.indexOf(record.id)
+      if (keyIndex >= 0) {
+        expandedRowKeys.value.splice(keyIndex, 1);
+      }
+    }
+  }
+  /**
+   *操作表格后处理树节点展开合并
+   * */
+  async function expandTreeNode(key) {
+    let record = findTableDataRecord(key)
+    expandedRowKeys.value.push(key);
+      let result = await getChildList({pid: key});
+      if (result && result.length > 0) {
+          record.children = getDataByResult(result);
+      } else {
+          record.children = null
+          record.hasChild = '0'
+      }
+      updateTableDataRecord(key, record);
+  }
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '确定删除吗?',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+      {
+        label: '添加下级',
+        onClick: handleAddSub.bind(null, {pid: record.id}),
+      }
+    ]
+  }
 </script>
 
 <style scoped>
 
-</style>
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/components/EmployAddressModal.vue

@@ -1,58 +1,87 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
-      <BasicForm @register="registerForm"/>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+    <BasicForm @register="registerForm"/>
   </BasicModal>
 </template>
-
 <script lang="ts" setup>
-    import {ref, computed, unref} from 'vue';
-    import {BasicModal, useModalInner} from '/@/components/Modal';
-    import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../employAddress.data';
-    import {saveOrUpdate} from '../employAddress.api';
-    // Emits声明
-    const emit = defineEmits(['register','success']);
-    const isUpdate = ref(true);
-    //表单配置
-    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
-        labelWidth: 150,
-        schemas: formSchema,
-        showActionButtonGroup: false,
-    });
-    //表单赋值
-    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
-        //重置表单
-        await resetFields();
-        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
-        isUpdate.value = !!data?.isUpdate;
-        if (unref(isUpdate)) {
-            //表单赋值
-            await setFieldsValue({
-                ...data.record,
-            });
-        }
-        // 隐藏底部时禁用整个表单
-       setProps({ disabled: !data?.showFooter })
+  import {ref, computed, unref} from 'vue';
+  import {BasicModal, useModalInner} from '/src/components/Modal';
+  import {BasicForm, useForm} from '/src/components/Form';
+  import {formSchema} from '../employAddress.data';
+  import {loadTreeData, saveOrUpdateDict} from '../employAddress.api';
+  // 获取emit
+  const emit = defineEmits(['register', 'success']);
+  const isUpdate = ref(true);
+  const expandedRowKeys = ref([]);
+  const treeData = ref([]);
+  //表单配置
+  const [registerForm, {resetFields, setFieldsValue, validate, updateSchema}] = useForm({
+    schemas: formSchema,
+    showActionButtonGroup: false,
+    labelCol: {
+      xs: { span: 24 },
+      sm: { span: 4 },
+    },
+    wrapperCol: {
+      xs: { span: 24 },
+      sm: { span: 18 },
+    },
+  });
+  //表单赋值
+  const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+    //重置表单
+    await resetFields();
+    expandedRowKeys.value = [];
+    setModalProps({confirmLoading: false, minHeight: 80});
+    isUpdate.value = !!data?.isUpdate;
+    if (data?.record) {
+      //表单赋值
+      await setFieldsValue({
+        ...data.record,
+      });
+    }
+    //父级节点树信息
+    treeData.value = await loadTreeData({'async': false,'pcode':''});
+    updateSchema({
+      field: 'pid',
+      componentProps: {treeData},
     });
-    //设置标题
-    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
-    //表单提交事件
-    async function handleSubmit(v) {
-        try {
-            let values = await validate();
-            setModalProps({confirmLoading: true});
-            //提交表单
-            await saveOrUpdate(values, isUpdate.value);
-            //关闭弹窗
-            closeModal();
-            //刷新列表
-            emit('success');
-        } finally {
-            setModalProps({confirmLoading: false});
+  });
+  //设置标题
+  const getTitle = computed(() => (!unref(isUpdate) ? '新增字典' : '编辑字典'));
+
+  /**
+   * 根据pid获取展开的节点
+   * @param pid
+   * @param arr
+   */
+  function getExpandKeysByPid(pid,arr){
+    if(pid && arr && arr.length>0){
+      for(let i=0;i<arr.length;i++){
+        if(arr[i].key==pid && unref(expandedRowKeys).indexOf(pid)<0){
+          expandedRowKeys.value.push(arr[i].key);
+          getExpandKeysByPid(arr[i]['parentId'],unref(treeData))
+        }else{
+          getExpandKeysByPid(pid,arr[i].children)
         }
+      }
+    }
+  }
+  //表单提交事件
+  async function handleSubmit() {
+    try {
+      let values = await validate();
+      setModalProps({confirmLoading: true});
+      //提交表单
+      await saveOrUpdateDict(values, isUpdate.value);
+      //关闭弹窗
+      closeModal();
+      //展开的节点信息
+      await getExpandKeysByPid(values['pid'],unref(treeData))
+      //刷新列表(isUpdate:是否编辑;values:表单信息;expandedArr:展开的节点信息)
+      emit('success', {isUpdate: unref(isUpdate), values:{...values},expandedArr: unref(expandedRowKeys).reverse()});
+    } finally {
+      setModalProps({confirmLoading: false});
     }
+  }
 </script>
-
-<style lang="less" scoped>
-
-</style>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ConfigController.java

@@ -60,8 +60,8 @@ public class ConfigController {
     //获取地址列表
     @ApiOperation(value="首页-获取地址列表", notes="首页-获取地址列表")
     @RequestMapping(value = "/queryAddressList", method = {RequestMethod.GET})
-    public Result<?> queryAddressList(PageBean pageBean){
-        return configService.queryAddressList(pageBean);
+    public Result<?> queryAddressList(String pid, PageBean pageBean){
+        return configService.queryAddressList(pid, pageBean);
     }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java

@@ -59,8 +59,8 @@ public class CommonApiController {
     //获取地址列表
     @ApiOperation(value="首页-获取地址列表", notes="首页-获取地址列表")
     @RequestMapping(value = "/queryAddressList", method = {RequestMethod.GET})
-    public Result<?> queryAddressList(PageBean pageBean){
-        return commonApiService.queryAddressList(pageBean);
+    public Result<?> queryAddressList(String pid, PageBean pageBean){
+        return commonApiService.queryAddressList(pid, pageBean);
     }
 
     /***************记工记账***************/

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java

@@ -23,7 +23,7 @@ public interface CommonApiService {
     public Result<?> queryJobNatureList(PageBean pageBean);
 
     //获取地址列表带分页
-    public Result<?> queryAddressList(PageBean pageBean);
+    public Result<?> queryAddressList(String pid, PageBean pageBean);
 
     /***************记工记账***************/
     //个人记工-新建账本

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java

@@ -45,7 +45,7 @@ public interface ConfigService {
      * @param pageBean
      * @return
      */
-    public Result<?> queryAddressList(PageBean pageBean);
+    public Result<?> queryAddressList(String pid, PageBean pageBean);
 
 }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.apiService.impl;
 
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.PageBean;
@@ -161,13 +162,22 @@ public class CommonApiServiceImpl implements CommonApiService {
 
     //获取地址列表带分页
     @Override
-    public Result<?> queryAddressList(PageBean pageBean) {
-        Page<EmployAddress> page = new Page<EmployAddress>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<EmployAddress> pageList = employAddressService
-                .lambdaQuery()
-                .page(page);
+    public Result<?> queryAddressList(String pid, PageBean pageBean) {
+        try{
+            if(StringUtils.isEmpty(pid)){
+                pid = "0";
+            }
+            Page<EmployAddress> page = new Page<EmployAddress>(pageBean.getPageNo(), pageBean.getPageSize());
+            Page<EmployAddress> pageList = employAddressService
+                    .lambdaQuery()
+                    .eq(EmployAddress::getPid, pid)
+                    .page(page);
 
-        return Result.OK("地址列表", pageList);
+            return Result.OK("地址列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("地址列表查询失败");
+        }
     }
 
     /***************记工记账***************/

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.apiService.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.ConfigService;
@@ -101,6 +102,7 @@ public class ConfigServiceImpl implements ConfigService {
             Page<EmployJobType> page = new Page<EmployJobType>(pageBean.getPageNo(), pageBean.getPageSize());
             Page<EmployJobType> pageList = employJobTypeService
                     .lambdaQuery()
+                    .orderByAsc(EmployJobType::getTypeOrder)
                     .page(page);
 
             return Result.OK("工种列表", pageList);
@@ -129,11 +131,15 @@ public class ConfigServiceImpl implements ConfigService {
 
     //获取地址列表带分页
     @Override
-    public Result<?> queryAddressList(PageBean pageBean) {
+    public Result<?> queryAddressList(String pid, PageBean pageBean) {
         try{
+            if(StringUtils.isEmpty(pid)){
+                pid = "0";
+            }
             Page<EmployAddress> page = new Page<EmployAddress>(pageBean.getPageNo(), pageBean.getPageSize());
             Page<EmployAddress> pageList = employAddressService
                     .lambdaQuery()
+                    .eq(EmployAddress::getPid, pid)
                     .page(page);
 
             return Result.OK("地址列表", pageList);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java

@@ -87,6 +87,10 @@ public class JobServiceImpl implements JobService {
                 //工作地域
                 query.eq(EmployJob::getAreaId, employJob.getAreaId());
             }
+            if(null != employJob.getWorkAddress()){
+                //工作地址
+                query.like(EmployJob::getWorkAddress, employJob.getWorkAddress());
+            }
             if(null != employJob.getTypeId()){
                 //工作类型
                 query.eq(EmployJob::getTypeId, employJob.getTypeId());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ResumeServiceImpl.java

@@ -82,7 +82,7 @@ public class ResumeServiceImpl implements ResumeService {
             }
             if(null != employResume.getExpectAddress()){
                 //期望工作地点
-                query.eq(EmployResume::getExpectAddress, employResume.getExpectAddress());
+                query.like(EmployResume::getExpectAddress, employResume.getExpectAddress());
             }
             if(null != employResume.getTitle()){
                 //简历名称
@@ -139,9 +139,9 @@ public class ResumeServiceImpl implements ResumeService {
             EmployResume resume = employResumeService.getById(resumeId);
             map.put("resume", resume);
 
-            //简历期望工作地
-            EmployAddress address = employAddressService.getById(resume.getExpectAddress());
-            resume.setExpectAddressName(address.getAdress());
+//            //简历期望工作地
+//            EmployAddress address = employAddressService.getById(resume.getExpectAddress());
+//            resume.setExpectAddressName(address.getAdress());
 
             //2、获取个人实名认证信息
             EmployAuthenticationPerson person = employAuthenticationPersonService