推送组织人员接口修改

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

@@ -1371,10 +1371,11 @@ public class SysUserController {
      */
     @ApiOperation(value = "树形")
     @RequestMapping(value = "/queryDepartUserTreeList", method = RequestMethod.GET)
-    public Result<List<SysDepartUserTreeModel>> queryDepartUserTreeList() {
+    public Result<List<SysDepartUserTreeModel>> queryDepartUserTreeList(String departId) {
         Result<List<SysDepartUserTreeModel>> result = new Result<>();
         try {
-            List<SysDepartTreeModel> departTreeModelList = sysDepartService.queryTreeList();
+            List<SysDepartTreeModel> departTreeModelList = sysDepartService.queryTreeListByDepartId(departId);
+
             List<SysDepartUserTreeModel> departUserTreeModelList = new ArrayList<>();
             departTreeModelList.forEach(item->{
                 //复制

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

@@ -28,6 +28,8 @@ public interface ISysDepartService extends IService<SysDepart>{
      */
     List<SysDepartTreeModel> queryTreeList();
 
+    List<SysDepartTreeModel> queryTreeListByDepartId(String departId);
+
     /**
      * 查询所有部门DepartId信息,并分节点进行显示
      * @return

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

@@ -23,6 +23,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
+import static com.jero.modules.system.util.FindsDepartsChildrenUtil.convertSysDepartToSysDepartTreeModel;
+
 /**
  * <p>
  * 部门表 服务实现类
@@ -86,6 +88,31 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 		return listResult;
 	}
 
+
+//	@Cacheable(value = CacheConstant.SYS_DEPARTS_CACHE)
+	@Override
+	public List<SysDepartTreeModel> queryTreeListByDepartId(String departId) {
+		LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
+		if (StringUtils.isBlank(departId)) {
+			query.isNull(SysDepart::getParentId);
+		} else {
+			query.eq(SysDepart::getParentId, departId);
+		}
+		query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
+		query.orderByAsc(SysDepart::getDepartOrder);
+		List<SysDepart> list = this.list(query);
+		// 调用wrapTreeDataToTreeList方法生成树状数据
+		List<SysDepartTreeModel> listResult = new ArrayList<>();
+		for (int i = 0; i < list.size(); i++) {
+			SysDepart depart = list.get(i);
+			SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel();
+			// 将sysDepart转换为sysDepartTreeModel
+			convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel);
+			listResult.add(sysDepartTreeModel);
+		}
+		return listResult;
+	}
+
 	@Cacheable(value = CacheConstant.SYS_DEPART_IDS_CACHE)
 	@Override
 	public List<DepartIdModel> queryDepartIdTreeList() {
@@ -297,7 +324,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 			for(SysDepart depart : departList) {
 				SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel();
 				// 将sysDepart转换为sysDepartTreeModel
-				FindsDepartsChildrenUtil.convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel);
+				convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel);
 				model = sysDepartTreeModel;
 				model.setChildren(null);
 	    //update-end--Author:huangzhilin  Date:20140417 for：[bugfree号]组织机构搜索功回显优化----------------------