提交 c999ba34 编写于 作者: JEECG低代码平台's avatar JEECG低代码平台

组织机构管理service代码不规范修复

上级 e47598cb
...@@ -12,9 +12,8 @@ import lombok.extern.slf4j.Slf4j; ...@@ -12,9 +12,8 @@ import lombok.extern.slf4j.Slf4j;
/** /**
* 异常处理器 * 异常处理器
* *
* @author chenshun * @author scott
* @email sunlightcs@gmail.com * @date 2019
* @date 2016年10月27日 下午10:16:19
*/ */
@RestControllerAdvice @RestControllerAdvice
@Slf4j @Slf4j
......
package org.jeecg.modules.system.service.impl; package org.jeecg.modules.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.ArrayList;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.Date;
import io.netty.util.internal.StringUtil; import java.util.List;
import org.jeecg.modules.system.controller.FindsDepartsChildrenUtil; import java.util.UUID;
import org.jeecg.common.util.YouBianCodeUtil; import org.jeecg.common.util.YouBianCodeUtil;
import org.jeecg.modules.system.controller.FindsDepartsChildrenUtil;
import org.jeecg.modules.system.entity.SysDepart; import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.mapper.SysDepartMapper; import org.jeecg.modules.system.mapper.SysDepartMapper;
import org.jeecg.modules.system.model.SysDepartTreeModel; import org.jeecg.modules.system.model.SysDepartTreeModel;
import org.jeecg.modules.system.service.ISysDepartService; import org.jeecg.modules.system.service.ISysDepartService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.netty.util.internal.StringUtil;
/** /**
* <p> * <p>
...@@ -25,13 +30,6 @@ import java.util.*; ...@@ -25,13 +30,6 @@ import java.util.*;
@Service @Service
public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDepart> implements ISysDepartService { public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDepart> implements ISysDepartService {
@Autowired
private ISysDepartService sysDepartService;
// 该集合用来存储部门下的所有数据
private List<SysDepart> globalList = new ArrayList<>();
/** /**
* queryTreeList 对应 queryTreeList 查询所有的部门数据,以树结构形式响应给前端 * queryTreeList 对应 queryTreeList 查询所有的部门数据,以树结构形式响应给前端
*/ */
...@@ -40,8 +38,7 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep ...@@ -40,8 +38,7 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep
LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>(); LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
query.eq(SysDepart::getDelFlag, 0); query.eq(SysDepart::getDelFlag, 0);
query.orderByAsc(SysDepart::getDepartOrder); query.orderByAsc(SysDepart::getDepartOrder);
List<SysDepart> list = sysDepartService.list(query); List<SysDepart> list = this.list(query);
globalList = list;
// 调用wrapTreeDataToTreeList方法生成树状数据 // 调用wrapTreeDataToTreeList方法生成树状数据
List<SysDepartTreeModel> listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list); List<SysDepartTreeModel> listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list);
return listResult; return listResult;
...@@ -68,7 +65,7 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep ...@@ -68,7 +65,7 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep
sysDepart.setOrgType(String.valueOf(orgType)); sysDepart.setOrgType(String.valueOf(orgType));
sysDepart.setCreateTime(new Date()); sysDepart.setCreateTime(new Date());
sysDepart.setDelFlag("0"); sysDepart.setDelFlag("0");
sysDepartService.save(sysDepart); this.save(sysDepart);
} }
} }
...@@ -99,7 +96,7 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep ...@@ -99,7 +96,7 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep
// 线判断数据库中的表是否为空,空则直接返回初始编码 // 线判断数据库中的表是否为空,空则直接返回初始编码
query1.eq(SysDepart::getParentId, ""); query1.eq(SysDepart::getParentId, "");
query1.orderByDesc(SysDepart::getOrgCode); query1.orderByDesc(SysDepart::getOrgCode);
departList = sysDepartService.list(query1); departList = this.list(query1);
if(departList == null || departList.size() == 0) { if(departList == null || departList.size() == 0) {
strArray[0] = YouBianCodeUtil.getNextYouBianCode(null); strArray[0] = YouBianCodeUtil.getNextYouBianCode(null);
strArray[1] = "1"; strArray[1] = "1";
...@@ -116,9 +113,9 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep ...@@ -116,9 +113,9 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep
// 降序排序 // 降序排序
query.orderByDesc(SysDepart::getOrgCode); query.orderByDesc(SysDepart::getOrgCode);
// 查询出同级部门的集合 // 查询出同级部门的集合
List<SysDepart> parentList = sysDepartService.list(query); List<SysDepart> parentList = this.list(query);
// 查询出父级部门 // 查询出父级部门
SysDepart depart = sysDepartService.getById(parentId); SysDepart depart = this.getById(parentId);
// 获取父级部门的Code // 获取父级部门的Code
String parentCode = depart.getOrgCode(); String parentCode = depart.getOrgCode();
// 根据父级部门类型算出当前部门的类型 // 根据父级部门类型算出当前部门的类型
...@@ -151,7 +148,7 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep ...@@ -151,7 +148,7 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep
* *
* @Transactional public boolean removeDepartDataById(String id) { * @Transactional public boolean removeDepartDataById(String id) {
* System.out.println("要删除的ID 为=============================>>>>>"+id); boolean * System.out.println("要删除的ID 为=============================>>>>>"+id); boolean
* flag = sysDepartService.removeById(id); return flag; } * flag = this.removeById(id); return flag; }
*/ */
/** /**
...@@ -163,7 +160,7 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep ...@@ -163,7 +160,7 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep
if (sysDepart != null && username != null) { if (sysDepart != null && username != null) {
sysDepart.setUpdateTime(new Date()); sysDepart.setUpdateTime(new Date());
sysDepart.setUpdateBy(username); sysDepart.setUpdateBy(username);
sysDepartService.updateById(sysDepart); this.updateById(sysDepart);
return true; return true;
} else { } else {
return false; return false;
...@@ -181,9 +178,9 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep ...@@ -181,9 +178,9 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep
public List<SysDepartTreeModel> searhBy(String keyWord) { public List<SysDepartTreeModel> searhBy(String keyWord) {
LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>(); LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
query.like(SysDepart::getDepartName, keyWord); query.like(SysDepart::getDepartName, keyWord);
List<SysDepart> departList = this.sysDepartService.list(query); List<SysDepart> departList = this.list(query);
List<SysDepartTreeModel> newList = new ArrayList<>(); List<SysDepartTreeModel> newList = new ArrayList<>();
if(departList.size() > 0 || sysDepartService != null) { if(departList.size() > 0) {
for(SysDepart depart : departList) { for(SysDepart depart : departList) {
newList.add(new SysDepartTreeModel(depart)); newList.add(new SysDepartTreeModel(depart));
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册