pull/229/MERGE^2
Chengliang 3 years ago
parent 0edebd1063
commit ba0b31f086

@ -77,7 +77,7 @@
<select id="getTreeData" resultMap="TreeResultMap">
select id, scheme_name,forbidden_tag
from jcl_org_scheme
where delete_type = '0'
where delete_type = '0' and forbidden_tag = 0
</select>
<select id="getSchemesByIds" resultMap="BaseResultMap">
select

@ -347,6 +347,7 @@ public class CompServiceImpl extends Service implements CompService {
List<SearchConditionGroup> addGroups = new ArrayList<>();
List<SearchConditionItem> condition = new ArrayList<>();
SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "转移到", "161", "company", "compBrowser");
compBrowserItem.setHelpfulTip("在不选择分部情况下,默认转移到一级分部!!!");
condition.add(compBrowserItem);
addGroups.add(new SearchConditionGroup("", true, condition));
return addGroups;
@ -355,7 +356,7 @@ public class CompServiceImpl extends Service implements CompService {
@Override
public int moveCompany(DepartmentMoveParam moveParam) {
Long targetCompanyId = moveParam.getCompany();
OrganizationAssert.notNull(targetCompanyId, "请选择要转移到的分部");
//OrganizationAssert.notNull(targetCompanyId, "请选择要转移到的分部");
Long companyId = moveParam.getId();
// 判断目标分部是否为它本身以及子元素
Set<Long> disableIds = new HashSet<>();

Loading…
Cancel
Save