【修改】将SysDepartTreeModel添加到core下的vo包下，去除参数为SysDepart的构造方法。添加转换器：SysDepart->SysDepartTreeModel

jero-boot/jero-boot-base/jero-boot-base-api/jero-system-cloud-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java

@@ -425,7 +425,7 @@ public interface ISysBaseAPI extends CommonAPI {
      * @param departId 部门id
      * @return JSONObject
      */
-    List<JSONObject> listParentDepartsByDepId(@RequestParam("departId") String departId);
+    List<SysDepartTreeModel> listParentDepartsByDepId(@RequestParam("departId") String departId);
 
     /**
      * 42根据部门id查询部门所有的子级(不包含自己)
@@ -434,7 +434,7 @@ public interface ISysBaseAPI extends CommonAPI {
      * @param departId 部门id
      * @return JSONObject
      */
-    List<JSONObject> listSonDepartsByDepId(@RequestParam("departId") String departId);
+    List<SysDepartTreeModel> listSonDepartsByDepId(@RequestParam("departId") String departId);
 
 
 

jero-boot/jero-boot-base/jero-boot-base-api/jero-system-cloud-api/src/main/java/com/jero/common/system/api/fallback/SysBaseAPIFallback.java

@@ -260,12 +260,12 @@ public class SysBaseAPIFallback implements ISysBaseAPI {
     }
 
     @Override
-    public List<JSONObject> listParentDepartsByDepId(String departId) {
+    public List<SysDepartTreeModel> listParentDepartsByDepId(String departId) {
         return null;
     }
 
     @Override
-    public List<JSONObject> listSonDepartsByDepId(String departId) {
+    public List<SysDepartTreeModel> listSonDepartsByDepId(String departId) {
         return null;
     }
 

jero-boot/jero-boot-base/jero-boot-base-api/jero-system-local-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java

@@ -288,7 +288,7 @@ public interface ISysBaseAPI extends CommonAPI {
      * @param departId 部门id
      * @return JSONObject
      */
-    List<JSONObject> listParentDepartsByDepId(String departId);
+    List<SysDepartTreeModel> listParentDepartsByDepId(String departId);
 
     /**
      * 42根据部门id查询部门所有的子级(不包含自己)
@@ -297,6 +297,6 @@ public interface ISysBaseAPI extends CommonAPI {
      * @param departId 部门id
      * @return JSONObject
      */
-    List<JSONObject> listSonDepartsByDepId(String departId);
+    List<SysDepartTreeModel> listSonDepartsByDepId(String departId);
 
 }

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/SysDepartTreeModel.java

@@ -1,6 +1,4 @@
-package com.jero.modules.system.model;
+package com.jero.common.system.vo;
-
-import com.jero.modules.system.entity.SysDepart;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -76,35 +74,6 @@ public class SysDepartTreeModel implements Serializable{
     private List<SysDepartTreeModel> children = new ArrayList<>();
 
 
-    /**
-     * 将SysDepart对象转换成SysDepartTreeModel对象
-     * @param sysDepart
-     */
-	public SysDepartTreeModel(SysDepart sysDepart) {
-		this.key = sysDepart.getId();
-        this.value = sysDepart.getId();
-        this.title = sysDepart.getDepartName();
-        this.id = sysDepart.getId();
-        this.parentId = sysDepart.getParentId();
-        this.departName = sysDepart.getDepartName();
-        this.departNameEn = sysDepart.getDepartNameEn();
-        this.departNameAbbr = sysDepart.getDepartNameAbbr();
-        this.departOrder = sysDepart.getDepartOrder();
-        this.description = sysDepart.getDescription();
-        this.orgCategory = sysDepart.getOrgCategory();
-        this.orgType = sysDepart.getOrgType();
-        this.orgCode = sysDepart.getOrgCode();
-        this.mobile = sysDepart.getMobile();
-        this.fax = sysDepart.getFax();
-        this.address = sysDepart.getAddress();
-        this.memo = sysDepart.getMemo();
-        this.status = sysDepart.getStatus();
-        this.delFlag = sysDepart.getDelFlag();
-        this.createBy = sysDepart.getCreateBy();
-        this.createTime = sysDepart.getCreateTime();
-        this.updateBy = sysDepart.getUpdateBy();
-        this.updateTime = sysDepart.getUpdateTime();
-    }
 
     public boolean getIsLeaf() {
         return isLeaf;

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java

@@ -7,8 +7,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jero.common.system.vo.SysDepartTreeModel;
 import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authz.annotation.RequiresRoles;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.CacheConstant;
 import com.jero.common.constant.CommonConstant;
@@ -21,7 +21,6 @@ import com.jero.common.util.oConvertUtils;
 import com.jero.modules.system.entity.SysDepart;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.model.DepartIdModel;
-import com.jero.modules.system.model.SysDepartTreeModel;
 import com.jero.modules.system.service.ISysDepartService;
 import com.jero.modules.system.service.ISysUserDepartService;
 import com.jero.modules.system.service.ISysUserService;

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java

@@ -6,13 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import com.jero.common.aspect.annotation.Dict;
-import com.jero.modules.system.model.SysDepartTreeModel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 import java.util.Objects;
 
 /**

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java

@@ -3,8 +3,6 @@ package com.jero.modules.system.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;
 import com.jero.modules.system.entity.SysDepart;
-import com.jero.modules.system.model.SysDepartTreeModel;
-import com.jero.modules.system.model.TreeModel;
 import org.springframework.data.repository.query.Param;
 
 import java.util.List;

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/model/DepartIdModel.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.jero.common.system.vo.SysDepartTreeModel;
 import com.jero.modules.system.entity.SysDepart;
 
 /**

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java

@@ -1,9 +1,9 @@
 package com.jero.modules.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.common.system.vo.SysDepartTreeModel;
 import com.jero.modules.system.entity.SysDepart;
 import com.jero.modules.system.model.DepartIdModel;
-import com.jero.modules.system.model.SysDepartTreeModel;
 import java.util.List;
 
 /**

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.base.Joiner;
-import com.jero.modules.system.model.SysDepartTreeModel;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -1000,11 +999,11 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 	 * @return JSONObject
 	 */
 	@Override
-	public List<JSONObject> listParentDepartsByDepId(String departId) {
+	public List<SysDepartTreeModel> listParentDepartsByDepId(String departId) {
-		 List<SysDepartTreeModel> sysDepartTreeModels = sysDepartService.listParentDepartsByDepId(departId);
+		return sysDepartService.listParentDepartsByDepId(departId);
-		return JSON.parseArray(JSON.toJSONString(sysDepartTreeModels)).toJavaList(JSONObject.class);
 	}
 
+
 	/**
 	 * 42根据部门id查询部门所有的子级(不包含自己)
 	 * @author 马志朝
@@ -1013,8 +1012,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 	 * @return JSONObject
 	 */
 	@Override
-	public List<JSONObject> listSonDepartsByDepId(String departId) {
+	public List<SysDepartTreeModel> listSonDepartsByDepId(String departId) {
-		List<SysDepartTreeModel> sysDepartTreeModels = sysDepartService.listSonDepartsByDepId(departId);
+		return sysDepartService.listSonDepartsByDepId(departId);
-		return JSON.parseArray(JSON.toJSONString(sysDepartTreeModels)).toJavaList(JSONObject.class);
 	}
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java

@@ -3,17 +3,16 @@ package com.jero.modules.system.service.impl;
 import java.util.*;
 
 import com.alibaba.fastjson.JSONObject;
+import com.jero.common.system.vo.SysDepartTreeModel;
 import org.apache.commons.lang.StringUtils;
 import com.jero.common.constant.CacheConstant;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.FillRuleConstant;
 import com.jero.common.util.FillRuleUtil;
 import com.jero.common.util.YouBianCodeUtil;
-import com.jero.common.util.oConvertUtils;
 import com.jero.modules.system.entity.*;
 import com.jero.modules.system.mapper.*;
 import com.jero.modules.system.model.DepartIdModel;
-import com.jero.modules.system.model.SysDepartTreeModel;
 import com.jero.modules.system.service.ISysDepartService;
 import com.jero.modules.system.util.FindsDepartsChildrenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -298,7 +297,10 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 		List<SysDepart> departList = this.list(query);
 		if(departList.size() > 0) {
 			for(SysDepart depart : departList) {
-				model = new SysDepartTreeModel(depart);
+				SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel();
+				// 将sysDepart转换为sysDepartTreeModel
+				FindsDepartsChildrenUtil.convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel);
+				model = sysDepartTreeModel;
 				model.setChildren(null);
 	    //update-end--Author:huangzhilin  Date:20140417 for：[bugfree号]组织机构搜索功回显优化----------------------
 				newList.add(model);

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java

@@ -1,11 +1,11 @@
 package com.jero.modules.system.util;
 
 import com.jero.common.constant.CommonConstant;
+import com.jero.common.system.vo.SysDepartTreeModel;
 import com.jero.common.util.RedisUtil;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.system.entity.SysDepart;
 import com.jero.modules.system.model.DepartIdModel;
-import com.jero.modules.system.model.SysDepartTreeModel;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;
@@ -39,7 +39,10 @@ public class FindsDepartsChildrenUtil {
         List<SysDepartTreeModel> records = new ArrayList<>();
         for (int i = 0; i < recordList.size(); i++) {
             SysDepart depart = recordList.get(i);
-            records.add(new SysDepartTreeModel(depart));
+            SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel();
+            // 将sysDepart转换为sysDepartTreeModel
+            convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel);
+            records.add(sysDepartTreeModel);
         }
         List<SysDepartTreeModel> tree = findChildren(records, idList);
         setEmptyChildrenAsNull(tree);
@@ -58,7 +61,10 @@ public class FindsDepartsChildrenUtil {
         List<SysDepartTreeModel> records = new ArrayList<>();
         for (int i = 0; i < recordList.size(); i++) {
             SysDepart depart = recordList.get(i);
-            records.add(new SysDepartTreeModel(depart));
+            SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel();
+            // 将sysDepart转换为sysDepartTreeModel
+            convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel);
+            records.add(sysDepartTreeModel);
         }
         findChildren(records, idList);
         return idList;
@@ -77,6 +83,7 @@ public class FindsDepartsChildrenUtil {
             if (oConvertUtils.isEmpty(branch.getParentId())) {
                 treeList.add(branch);
                 DepartIdModel departIdModel = new DepartIdModel().convert(branch);
+
                 departIdList.add(departIdModel);
             }
         }
@@ -100,6 +107,7 @@ public class FindsDepartsChildrenUtil {
                 if (m.getParentId()!=null && m.getParentId().equals(model.getId())) {
                     model.getChildren().add(m);
                     DepartIdModel dim = new DepartIdModel().convert(m);
+
                     idModel.getChildren().add(dim);
                 }
             }
@@ -127,4 +135,38 @@ public class FindsDepartsChildrenUtil {
         }
         // sysDepartTreeList = treeList;
     }
+
+    /**
+     * 将SysDepart对象转换成SysDepartTreeModel对象
+     * @author 马志朝
+     * @date 2021/3/25 13:15
+     * @param sysDepart 待转换的对象
+     * @param sysDepartTreeModel 转换的结果对象
+     * @return
+     */
+    public static void convertSysDepartToSysDepartTreeModel(SysDepart sysDepart, SysDepartTreeModel sysDepartTreeModel){
+        sysDepartTreeModel.setKey( sysDepart.getId());
+        sysDepartTreeModel.setValue( sysDepart.getId());
+        sysDepartTreeModel.setTitle(sysDepart.getDepartName());
+        sysDepartTreeModel.setId(sysDepart.getId());
+        sysDepartTreeModel.setParentId(sysDepart.getParentId());
+        sysDepartTreeModel.setDepartName(sysDepart.getDepartName());
+        sysDepartTreeModel.setDepartNameEn(sysDepart.getDepartNameEn());
+        sysDepartTreeModel.setDepartNameAbbr(sysDepart.getDepartNameAbbr());
+        sysDepartTreeModel.setDepartOrder(sysDepart.getDepartOrder());
+        sysDepartTreeModel.setDescription(sysDepart.getDescription());
+        sysDepartTreeModel.setOrgCategory(sysDepart.getOrgCategory());
+        sysDepartTreeModel.setOrgType(sysDepart.getOrgType());
+        sysDepartTreeModel.setOrgCode(sysDepart.getOrgCode());
+        sysDepartTreeModel.setMobile(sysDepart.getMobile());
+        sysDepartTreeModel.setFax(sysDepart.getFax());
+        sysDepartTreeModel.setAddress(sysDepart.getAddress());
+        sysDepartTreeModel.setMemo(sysDepart.getMemo());
+        sysDepartTreeModel.setStatus(sysDepart.getStatus());
+        sysDepartTreeModel.setDelFlag(sysDepart.getDelFlag());
+        sysDepartTreeModel.setCreateBy(sysDepart.getCreateBy());
+        sysDepartTreeModel.setCreateTime(sysDepart.getCreateTime());
+        sysDepartTreeModel.setUpdateBy(sysDepart.getUpdateBy());
+        sysDepartTreeModel.setUpdateTime(sysDepart.getUpdateTime());
+    }
 }