|
|
@@ -1914,19 +1914,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
|
|
|
|
|
|
if (node != null) {
|
|
|
if (!new Integer("6").equals(node.getNodeType()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType() + "")) {
|
|
|
- if (node.getParentId() == 0) {
|
|
|
- throw new ServiceException("请从第三层级节点开始进行检索");
|
|
|
- } else {
|
|
|
- WbsTreeContract wbsTreeContract = jdbcTemplate.query("select parent_id from m_wbs_tree_contract where is_deleted = 0 and status = 1 and type = 1 and id = " + node.getParentId() + " and contract_id = " + node.getContractId(), new BeanPropertyRowMapper<>(WbsTreeContract.class)).stream().findAny().orElse(null);
|
|
|
- if (wbsTreeContract != null && wbsTreeContract.getParentId().equals(0L)) {
|
|
|
- throw new ServiceException("请从第三层级节点开始进行检索");
|
|
|
- }
|
|
|
- WbsTreeContract oldSelectedNode = BeanUtil.copyProperties(node, WbsTreeContract.class);
|
|
|
- childNodesPkeyIds = this.getChildNodesPkeyIds(oldSelectedNode, lowestNodesPkeyIds);
|
|
|
- List<String> sj = this.getSJ(contract, vo, lowestNodesPkeyIds);
|
|
|
- if (sj != null && sj.size() > 0) {
|
|
|
- submitNodeKeyIds.addAll(sj);
|
|
|
- }
|
|
|
+ WbsTreeContract oldSelectedNode = BeanUtil.copyProperties(node, WbsTreeContract.class);
|
|
|
+ childNodesPkeyIds = this.getChildNodesPkeyIds(oldSelectedNode, lowestNodesPkeyIds);
|
|
|
+ List<String> sj = this.getSJ(contract, vo, lowestNodesPkeyIds);
|
|
|
+ if (sj != null && sj.size() > 0) {
|
|
|
+ submitNodeKeyIds.addAll(sj);
|
|
|
}
|
|
|
}
|
|
|
vo.setWbsIds(submitNodeKeyIds);
|