|
@@ -9,8 +9,8 @@ import kd.hr.hbp.business.dao.factory.HRBaseDaoFactory;
|
|
|
import kd.hr.hbp.common.constants.org.OrgTreeDynEnum;
|
|
|
import kd.hr.hbp.common.util.org.model.OrgTreeModel;
|
|
|
import kd.hr.hbp.formplugin.web.org.template.AdminOrgTreeListTemplate;
|
|
|
+import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
|
|
|
|
|
|
-import java.util.Arrays;
|
|
|
import java.util.HashSet;
|
|
|
import java.util.Set;
|
|
|
|
|
@@ -31,14 +31,13 @@ public class PerfManagerTreeListPlugin extends AdminOrgTreeListTemplate {
|
|
|
String focusNodeId = buildTreeListFilterEvent.getNodeId().toString();
|
|
|
QFilter nodeClickFilter = null;
|
|
|
if(!this.getTreeModel().getRoot().getId().equalsIgnoreCase(focusNodeId)){
|
|
|
- QFilter isCurrentVersionFilter = new QFilter("iscurrentversion", QCP.equals, "1");
|
|
|
- QFilter initStatusFilter = new QFilter("initstatus", QCP.equals, "2");
|
|
|
- QFilter dataStatusFilter = new QFilter("datastatus", QCP.in, Arrays.asList("1", "2"));
|
|
|
+
|
|
|
QFilter focusNodeIdFilter = new QFilter("adminorg.id", QCP.equals, Long.valueOf(focusNodeId));
|
|
|
- DynamicObject structlongnumber = HRBaseDaoFactory.getInstance(this.getEntityName()).queryOne("structlongnumber", new QFilter[]{isCurrentVersionFilter, initStatusFilter, dataStatusFilter, focusNodeIdFilter});
|
|
|
+ DynamicObject structlongnumber = HRBaseDaoFactory.getInstance(this.getEntityName()).queryOne("structlongnumber", new QFilter[]{QFilterCommonHelper.getCurrentVersionFilter(), QFilterCommonHelper.getInitStatusFinishFilter(),
|
|
|
+ QFilterCommonHelper.getDataStatusFilter(), focusNodeIdFilter});
|
|
|
String focusNodeLongNumber = (String)structlongnumber.get("structlongnumber");
|
|
|
QFilter filter = new QFilter("structlongnumber", QCP.like, focusNodeLongNumber + "%");
|
|
|
- DynamicObjectCollection dynamicObjects = HRBaseDaoFactory.getInstance(this.getEntityName()).queryColl("adminorg.id adminorg", new QFilter[]{filter, isCurrentVersionFilter, initStatusFilter}, null);
|
|
|
+ DynamicObjectCollection dynamicObjects = HRBaseDaoFactory.getInstance(this.getEntityName()).queryColl("adminorg.id adminorg", new QFilter[]{filter, QFilterCommonHelper.getCurrentVersionFilter(), QFilterCommonHelper.getInitStatusFinishFilter()}, null);
|
|
|
Set<Long> ids = new HashSet<>(dynamicObjects.size());
|
|
|
dynamicObjects.forEach(dynamicObject -> ids.add(dynamicObject.getLong("adminorg")));
|
|
|
nodeClickFilter = new QFilter("nckd_person.adminorg.id", QCP.in, ids);
|