Commit 43447079 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7

parents 39b5c109 4807b95e
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
from t_employee_project_belong_dept b from t_employee_project_belong_dept b
LEFT JOIN t_employee_project a on b.id = a.id LEFT JOIN t_employee_project a on b.id = a.id
<where> <where>
a.DELETE_FLAG ='0' a.DELETE_FLAG ='0' and ((a.PROJECT_SOURCE = '1' and a.STATUS = 1) or a.PROJECT_SOURCE != '1')
<if test="tEmployeeProjectBelongDept.deptId != null and tEmployeeProjectBelongDept.deptId.trim() != ''"> <if test="tEmployeeProjectBelongDept.deptId != null and tEmployeeProjectBelongDept.deptId.trim() != ''">
AND a.DEPT_ID = #{tEmployeeProjectBelongDept.deptId} AND a.DEPT_ID = #{tEmployeeProjectBelongDept.deptId}
</if> </if>
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
from t_employee_project_belong_dept b from t_employee_project_belong_dept b
LEFT JOIN t_employee_project a on b.id = a.id LEFT JOIN t_employee_project a on b.id = a.id
<where> <where>
a.DELETE_FLAG ='0' a.DELETE_FLAG ='0' and ((a.PROJECT_SOURCE = '1' and a.STATUS = 1) or a.PROJECT_SOURCE != '1')
<if test="deptId != null and deptId.trim() != ''"> <if test="deptId != null and deptId.trim() != ''">
AND a.DEPT_ID = #{deptId} AND a.DEPT_ID = #{deptId}
</if> </if>
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
from t_employee_project a from t_employee_project a
LEFT JOIN t_employee_project_belong_dept b on a.id=b.id LEFT JOIN t_employee_project_belong_dept b on a.id=b.id
<where> <where>
a.DELETE_FLAG ='0' and b.id is null a.DELETE_FLAG ='0' and ((a.PROJECT_SOURCE = '1' and a.STATUS = 1) or a.PROJECT_SOURCE != '1') and b.id is null
<if test="tEmployeeProjectBelongDept.deptId != null and tEmployeeProjectBelongDept.deptId.trim() != ''"> <if test="tEmployeeProjectBelongDept.deptId != null and tEmployeeProjectBelongDept.deptId.trim() != ''">
AND a.DEPT_ID = #{tEmployeeProjectBelongDept.deptId} AND a.DEPT_ID = #{tEmployeeProjectBelongDept.deptId}
</if> </if>
......
...@@ -494,13 +494,13 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl ...@@ -494,13 +494,13 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
if (Common.isEmpty(info)) { if (Common.isEmpty(info)) {
return R.failed("父级部门未找到"); return R.failed("父级部门未找到");
} }
if (Common.isNotNull(info.getAncestors())){ // 暂时不加这个限制
// todo 商量是否加这个限制 // if (Common.isNotNull(info.getAncestors())){
String[] split = info.getAncestors().split(","); // String[] split = info.getAncestors().split(",");
if (split.length >= 6){ // if (split.length >= 6){
return R.failed("添加部门的层级超出限制,最多支持5级"); // return R.failed("添加部门的层级超出限制,最多支持5级");
} // }
} // }
dept.setAncestors(info.getAncestors() + "," + dept.getParentId()); dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment