项目管理添加与机构关联逻辑，bug修复等

fastbee-service/fastbee-system-service/src/main/java/com/fastbee/system/domain/SysDistrict.java

@@ -0,0 +1,70 @@
+package com.fastbee.system.domain;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fastbee.common.annotation.Excel;
+import com.fastbee.common.core.domain.BaseEntity;
+
+/**
+ * 行政区划对象 sys_district
+ *
+ * @author kerwincui
+ * @date 2024-10-18
+ */
+@ApiModel(value = "SysDistrict",description = "行政区划 sys_district")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysDistrict extends BaseEntity
+        {
+private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long id;
+
+    /** 城市id */
+            @Excel(name = "城市id")
+            @ApiModelProperty("城市id")
+    private Long adcode;
+
+    /** 省市级别 */
+            @Excel(name = "省市级别")
+            @ApiModelProperty("省市级别")
+    private Long level;
+
+    /** 父级id */
+            @Excel(name = "父级id")
+            @ApiModelProperty("父级id")
+    private Long parentId;
+
+    /** 简称 */
+            @Excel(name = "简称")
+            @ApiModelProperty("简称")
+    private String name;
+
+    /** 全称 */
+            @Excel(name = "全称")
+            @ApiModelProperty("全称")
+    private String fullName;
+
+    /** 经度 */
+            @Excel(name = "经度")
+            @ApiModelProperty("经度")
+    private BigDecimal lng;
+
+    /** 纬度 */
+            @Excel(name = "纬度")
+            @ApiModelProperty("纬度")
+    private BigDecimal lat;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    private List<SysDistrict> children;
+}

fastbee-service/fastbee-system-service/src/main/java/com/fastbee/system/mapper/SysDeptMapper.java

@@ -2,7 +2,7 @@ package com.fastbee.system.mapper;
 
 import java.util.List;
 
-import com.fastbee.system.domain.SysRoleDept;
+import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 import com.fastbee.common.core.domain.entity.SysDept;
 
@@ -11,7 +11,7 @@ import com.fastbee.common.core.domain.entity.SysDept;
  *
  * @author ruoyi
  */
-public interface SysDeptMapper
+public interface SysDeptMapper extends MPJBaseMapper<SysDept>
 {
     /**
      * 查询部门管理数据

fastbee-service/fastbee-system-service/src/main/java/com/fastbee/system/mapper/SysDistrictMapper.java

@@ -0,0 +1,63 @@
+package com.fastbee.system.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fastbee.system.domain.SysDistrict;
+
+/**
+ * 行政区划Mapper接口
+ *
+ * @author kerwincui
+ * @date 2024-10-18
+ */
+public interface SysDistrictMapper extends BaseMapper<SysDistrict>
+{
+    /**
+     * 查询行政区划
+     *
+     * @param id 行政区划主键
+     * @return 行政区划
+     */
+    public SysDistrict selectSysDistrictById(Long id);
+
+    /**
+     * 查询行政区划列表
+     *
+     * @param sysDistrict 行政区划
+     * @return 行政区划集合
+     */
+    public List<SysDistrict> selectSysDistrictList(SysDistrict sysDistrict);
+
+    /**
+     * 新增行政区划
+     *
+     * @param sysDistrict 行政区划
+     * @return 结果
+     */
+    public int insertSysDistrict(SysDistrict sysDistrict);
+
+    /**
+     * 修改行政区划
+     *
+     * @param sysDistrict 行政区划
+     * @return 结果
+     */
+    public int updateSysDistrict(SysDistrict sysDistrict);
+
+    /**
+     * 删除行政区划
+     *
+     * @param id 行政区划主键
+     * @return 结果
+     */
+    public int deleteSysDistrictById(Long id);
+
+    /**
+     * 批量删除行政区划
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysDistrictByIds(Long[] ids);
+}

fastbee-service/fastbee-system-service/src/main/java/com/fastbee/system/service/ISysDistrictService.java

@@ -0,0 +1,63 @@
+package com.fastbee.system.service;
+
+import java.util.List;
+import com.fastbee.system.domain.SysDistrict;
+
+/**
+ * 行政区划Service接口
+ * 
+ * @author kerwincui
+ * @date 2024-10-18
+ */
+public interface ISysDistrictService 
+{
+    /**
+     * 查询行政区划
+     * 
+     * @param id 行政区划主键
+     * @return 行政区划
+     */
+    public SysDistrict selectSysDistrictById(Long id);
+
+    /**
+     * 查询行政区划列表
+     * 
+     * @param sysDistrict 行政区划
+     * @return 行政区划集合
+     */
+    public List<SysDistrict> selectSysDistrictList(SysDistrict sysDistrict);
+
+    /**
+     * 新增行政区划
+     * 
+     * @param sysDistrict 行政区划
+     * @return 结果
+     */
+    public int insertSysDistrict(SysDistrict sysDistrict);
+
+    /**
+     * 修改行政区划
+     * 
+     * @param sysDistrict 行政区划
+     * @return 结果
+     */
+    public int updateSysDistrict(SysDistrict sysDistrict);
+
+    /**
+     * 批量删除行政区划
+     * 
+     * @param ids 需要删除的行政区划主键集合
+     * @return 结果
+     */
+    public int deleteSysDistrictByIds(Long[] ids);
+
+    /**
+     * 删除行政区划信息
+     * 
+     * @param id 行政区划主键
+     * @return 结果
+     */
+    public int deleteSysDistrictById(Long id);
+
+    List<SysDistrict> selectSysDistrictTree();
+}

fastbee-service/fastbee-system-service/src/main/java/com/fastbee/system/service/impl/SysDistrictServiceImpl.java

@@ -0,0 +1,142 @@
+package com.fastbee.system.service.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fastbee.system.mapper.SysDistrictMapper;
+import com.fastbee.system.domain.SysDistrict;
+import com.fastbee.system.service.ISysDistrictService;
+
+
+/**
+ * 行政区划Service业务层处理
+ * 
+ * @author kerwincui
+ * @date 2024-10-18
+ */
+@Service
+public class SysDistrictServiceImpl implements ISysDistrictService 
+{
+    @Autowired
+    private SysDistrictMapper sysDistrictMapper;
+
+    /**
+     * 查询行政区划
+     * 
+     * @param id 行政区划主键
+     * @return 行政区划
+     */
+    @Override
+    public SysDistrict selectSysDistrictById(Long id)
+    {
+        return sysDistrictMapper.selectSysDistrictById(id);
+    }
+
+    /**
+     * 查询行政区划列表
+     * 
+     * @param sysDistrict 行政区划
+     * @return 行政区划
+     */
+    @Override
+    public List<SysDistrict> selectSysDistrictList(SysDistrict sysDistrict)
+    {
+        return sysDistrictMapper.selectSysDistrictList(sysDistrict);
+    }
+
+    /**
+     * 新增行政区划
+     * 
+     * @param sysDistrict 行政区划
+     * @return 结果
+     */
+    @Override
+    public int insertSysDistrict(SysDistrict sysDistrict)
+    {
+        return sysDistrictMapper.insertSysDistrict(sysDistrict);
+    }
+
+    /**
+     * 修改行政区划
+     * 
+     * @param sysDistrict 行政区划
+     * @return 结果
+     */
+    @Override
+    public int updateSysDistrict(SysDistrict sysDistrict)
+    {
+        return sysDistrictMapper.updateSysDistrict(sysDistrict);
+    }
+
+    /**
+     * 批量删除行政区划
+     * 
+     * @param ids 需要删除的行政区划主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysDistrictByIds(Long[] ids)
+    {
+        return sysDistrictMapper.deleteSysDistrictByIds(ids);
+    }
+
+    /**
+     * 删除行政区划信息
+     * 
+     * @param id 行政区划主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysDistrictById(Long id)
+    {
+        return sysDistrictMapper.deleteSysDistrictById(id);
+    }
+
+    /**
+     * 查询行政区划树状列表
+     * @return 树状列表
+     */
+    @Override
+    public List<SysDistrict> selectSysDistrictTree() {
+        List<SysDistrict> sysDistrictList = new LambdaQueryChainWrapper<>(sysDistrictMapper)
+                .select(SysDistrict::getId, SysDistrict::getParentId, SysDistrict::getName, SysDistrict::getAdcode,
+                        SysDistrict::getLevel, SysDistrict::getFullName, SysDistrict::getName
+                        , SysDistrict::getLng, SysDistrict::getLat)
+                .list();
+        return buildTree(sysDistrictList);
+
+    }
+
+    private List<SysDistrict> buildTree(List<SysDistrict> SysDistricts) {
+        Map<Long, SysDistrict> map = new HashMap<>();
+        List<SysDistrict> roots = new ArrayList<>();
+        for (SysDistrict sysDistrict : SysDistricts) {
+            map.put(sysDistrict.getAdcode(), sysDistrict);
+        }
+        return getDistricts(SysDistricts, map, roots);
+    }
+
+    private List<SysDistrict> getDistricts(List<SysDistrict> SysDistricts, Map<Long, SysDistrict> map, List<SysDistrict> roots) {
+        for (SysDistrict sysDistrict : SysDistricts) {
+            Long parentId = sysDistrict.getParentId();
+            if (parentId == null || !map.containsKey(parentId)) {
+                roots.add(sysDistrict);
+            } else {
+                SysDistrict parent = map.get(parentId);
+                if (parent.getChildren() == null) {
+                    parent.setChildren(new ArrayList<>());
+                }
+                parent.getChildren().add(sysDistrict);
+            }
+        }
+        return roots;
+    }
+
+}