feat(hr): 更新组织实体标识常量引用

- 将 ADMINORGHR_ENTITYID 常量更名为 ADMINORG_ENTITYID 并更新所有引用
- 修改了多个业务模块中对组织实体的查询和创建逻辑
- 调整了绩效管理表单中的步骤控制和数据过滤逻辑
- 优化了组织相关数据加载和处理流程
- 移除了部分冗余的代码和注释
- 修正了数据绑定和视图更新的相关调用

code/base/nckd-jxccl-base-common/src/main/java/nckd/jxccl/base/common/constant/FormConstant.java

@@ -41,7 +41,7 @@ public class FormConstant {
     /**职级-实体标识*/
     public static final String HBJM_JOBLEVELHR = "hbjm_joblevelhr";
     /** HR行政组织-实体标识*/
-    public static final String ADMINORGHR_ENTITYID = "haos_adminorghr";
+    public static final String ADMINORG_ENTITYID = "haos_adminorg";
     /** 组织分配-实体标识 */
     public static final String ASSIGNMENT_ENTITYID = "hrpi_assignment";
     /** 岗位-实体标识*/

code/base/nckd-jxccl-base-common/src/main/java/nckd/jxccl/base/common/plugins/LoadMultiOrgByEmpPosOrgRelListPlugin.java

@@ -42,7 +42,7 @@ public class LoadMultiOrgByEmpPosOrgRelListPlugin extends AbstractListPlugin imp
                     .addIdNumberName(FormConstant.NCKD_FIFTHORG)
                     .addIdNumberName(FormConstant.NCKD_SIXTHORG);
             QFilter qFilter = new QFilter(FormConstant.ID_KEY, QCP.in, adminOrgIds);
-            DynamicObjectCollection adminOrgColl = QueryServiceHelper.query(FormConstant.ADMINORGHR_ENTITYID, queryFieldBuilder.buildSelect(), new QFilter[]{qFilter});
+            DynamicObjectCollection adminOrgColl = QueryServiceHelper.query(FormConstant.ADMINORG_ENTITYID, queryFieldBuilder.buildSelect(), new QFilter[]{qFilter});
             map = adminOrgColl.stream()
                     .collect(Collectors.toMap(
                             obj -> obj.getLong(FormConstant.ID_KEY),

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/homs/business/application/event/GenerateEmploymentContractEventServicePlugin.java

@@ -221,13 +221,13 @@ public class GenerateEmploymentContractEventServicePlugin implements IEventServi
             // 设置 常驻工作地
             contractApplyNewDyo.set(GECEventConstant.BASELOCATION_KEY, personInfo.getDynamicObject(GECEventConstant.HRPI_EMPPOSORGREL_WORKPLACE));
             // 设置 公司
-            contractApplyNewDyo.set(GECEventConstant.CURCOMPANY_KEY, EntityHelper.newEntity(GECEventConstant.ADMINORGHR_ENTITYID, personInfo.getLong(GECEventConstant.HAOS_ADMINORGHR_BELONGCOMPANY_ID)));
+            contractApplyNewDyo.set(GECEventConstant.CURCOMPANY_KEY, EntityHelper.newEntity(GECEventConstant.ADMINORG_ENTITYID, personInfo.getLong(GECEventConstant.HAOS_ADMINORGHR_BELONGCOMPANY_ID)));
             // 设置 公司历史
-            contractApplyNewDyo.set(GECEventConstant.SIGNEDCOMPANYHIS_KEY, EntityHelper.newEntity(GECEventConstant.ADMINORGHR_ENTITYID, personInfo.getLong(GECEventConstant.HAOS_ADMINORGHR_BELONGCOMPANY_SOURCEVID)));
+            contractApplyNewDyo.set(GECEventConstant.SIGNEDCOMPANYHIS_KEY, EntityHelper.newEntity(GECEventConstant.ADMINORG_ENTITYID, personInfo.getLong(GECEventConstant.HAOS_ADMINORGHR_BELONGCOMPANY_SOURCEVID)));
             // 设置 部门
-            contractApplyNewDyo.set(GECEventConstant.CURDEPT_KEY, EntityHelper.newEntity(GECEventConstant.ADMINORGHR_ENTITYID, personInfo.getLong(GECEventConstant.HAOS_ADMINORGHR_ID)));
+            contractApplyNewDyo.set(GECEventConstant.CURDEPT_KEY, EntityHelper.newEntity(GECEventConstant.ADMINORG_ENTITYID, personInfo.getLong(GECEventConstant.HAOS_ADMINORGHR_ID)));
             // 设置 部门历史
-            contractApplyNewDyo.set(GECEventConstant.DEPARTMENTHIS_KEY, EntityHelper.newEntity(GECEventConstant.ADMINORGHR_ENTITYID, personInfo.getLong(GECEventConstant.HAOS_ADMINORGHR_SOURCEVID)));
+            contractApplyNewDyo.set(GECEventConstant.DEPARTMENTHIS_KEY, EntityHelper.newEntity(GECEventConstant.ADMINORG_ENTITYID, personInfo.getLong(GECEventConstant.HAOS_ADMINORGHR_SOURCEVID)));
             // 设置 岗位
             contractApplyNewDyo.set(GECEventConstant.CURPOSTION_KEY, EntityHelper.newEntity(GECEventConstant.HBPM_POSITIONHR, personInfo.getLong(GECEventConstant.HBPM_POSITIONHR_ID)));
             // 设置 岗位历史

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/homs/plugin/form/orgbatch/OrgBatchChgBillListPlugin.java

@@ -115,7 +115,7 @@ public class OrgBatchChgBillListPlugin extends AbstractListPlugin {
             // 设置F7列表表单模板（根据基础资料类型选择）
             listShowParameter.setFormId(OrgBatchConstant.HAOS_ORGTREE_LIST_F7_FORMID);
             // 设置基础资料标识
-            listShowParameter.setBillFormId(OrgBatchConstant.ADMINORGHR_ENTITYID);
+            listShowParameter.setBillFormId(OrgBatchConstant.ADMINORG_ENTITYID);
             // 设置打开方式为模态窗口
             listShowParameter.getOpenStyle().setShowType(ShowType.Modal);
             // 设置界面大小

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/hstu/business/CreateEvalQuestService.java

@@ -556,7 +556,7 @@ public class CreateEvalQuestService {
                             Map<String, DynamicObject> innerMap = new HashMap<>(2);
                             Long companyId = ConvertUtil.toLong(item.get("company"));
                             if(companyId != null && companyId > 0){
-                                DynamicObject company = BusinessDataServiceHelper.loadSingle(companyId, "haos_adminorghr");
+                                DynamicObject company = BusinessDataServiceHelper.loadSingle(companyId, FormConstant.ADMINORG_ENTITYID);
                                 innerMap.put("company", company);
                             }
                             Long jobId = ConvertUtil.toLong(item.get("job"));

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/hstu/business/helper/HonorStudentHelper.java

@@ -61,7 +61,7 @@ public class HonorStudentHelper {
      */
     public static Integer getOrgDifference(Long orgId) {
         //获取组织上下级结构长编码
-        DynamicObject adminOrgHr = BusinessDataServiceHelper.loadSingle(FormConstant.ADMINORGHR_ENTITYID, FormConstant.STRUCTLONGNUMBER, new QFilter[]{QFilterCommonHelper.getIdEqFilter(orgId)});
+        DynamicObject adminOrgHr = BusinessDataServiceHelper.loadSingle(FormConstant.ADMINORG_ENTITYID, FormConstant.STRUCTLONGNUMBER, new QFilter[]{QFilterCommonHelper.getIdEqFilter(orgId)});
         String structLongNumber = adminOrgHr.getString(FormConstant.STRUCTLONGNUMBER);
         String[] structLongNumbers = structLongNumber.split("!");
 

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/business/AnnualAdjustmentService.java

@@ -904,7 +904,7 @@ public class AnnualAdjustmentService {
         DynamicObject dep = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORGHR_ENTITYID);
         dep.set(FormConstant.ID_KEY, empPosOrgRel.getLong(String.join(".",FormConstant.ADMINORG,FormConstant.ID_KEY)));
         newPersonPosFile.set(PositionStructureConstant.USEORG_KEY, dep);*/
-        DynamicObject dep = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORGHR_ENTITYID);
+        DynamicObject dep = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORG_ENTITYID);
         dep.set(FormConstant.ID_KEY, empPosOrgRel.getLong(String.join(".",FormConstant.ADMINORG,FormConstant.ID_KEY)));
         newPersonPosFile.set(PositionStructureConstant.NCKD_DEP, dep);
 

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/business/ManagerAllowanceService.java

@@ -512,7 +512,7 @@ public class ManagerAllowanceService {
 
         // 这里要从数据库加载一下组织，不然没有1、2、3、4、5、6级组织
         DynamicObject[] adminOrgArray = BusinessDataServiceHelper.load(
-                FormConstant.ADMINORGHR_ENTITYID,
+                FormConstant.ADMINORG_ENTITYID,
                 adminOrgQueryFieldBuilder.buildSelect(),
                 new QFilter[]{QFilterCommonHelper.getIdInFilter(adminIds)});
 

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/form/performance/PerfRankMgmtFormPlugin.java

@@ -98,21 +98,42 @@ public class PerfRankMgmtFormPlugin extends AbstractFormPlugin implements Wizard
         wizard.addWizardStepsListener(this);
     }
 
-
     @Override
     public void afterBindData(EventObject e) {
-        sortEntry();
+//        sortEntry();
+        this.getView().updateView(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
         // 该单据不需要审批，默认为暂存状态
         this.getModel().setValue(FormConstant.STATUS, StatusEnum.A.toString());
         String step = ConvertUtil.toStr(this.getModel().getValue(PerfRankMgmtConstant.NCKD_STEP));
-        if("1".equals(step)){
+        String cacheStep = this.getView().getPageCache().get(PerfRankMgmtConstant.NCKD_STEP);
+        if("1".equals(step) || ("1".equals(cacheStep))){
+            if("1".equals(cacheStep)){
+                this.getModel().setValue(PerfRankMgmtConstant.NCKD_STEP, 1);
+                this.getView().updateView(PerfRankMgmtConstant.NCKD_STEP);
+                this.getView().getPageCache().put(PerfRankMgmtConstant.NCKD_STEP,null);
+                this.getView().updateView(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
+                /*DynamicObjectCollection dynamicObjectCollection = this.getModel().getDataEntity(true).getDynamicObjectCollection(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
+                for (int i = 0; i < dynamicObjectCollection.size(); i++) {
+                    boolean isRanking = dynamicObjectCollection.get(i).getBoolean(PerfRankMgmtConstant.NCKD_ISRANKING);
+                    if(!isRanking){
+                        this.getModel().setValue(PerfRankMgmtConstant.NCKD_ISRANKING,true,i);
+                        this.getView().updateView(PerfRankMgmtConstant.NCKD_ISRANKING,i);
+                        this.getModel().setValue(PerfRankMgmtConstant.NCKD_ISRANKING,false,i);
+                        this.getView().updateView(PerfRankMgmtConstant.NCKD_ISRANKING,i);
+                    }
+                }*/
+                DynamicObjectCollection entryEntityCols = this.getModel().getDataEntity(true).getDynamicObjectCollection(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
+                entryEntityCols.removeIf(obj -> obj.getBoolean(PerfRankMgmtConstant.NCKD_ISRANKING));
+            }
             setStepStatus(0,Steps.FINISH);
             setStepStatus(1,Steps.PROCESS);
 
+            //步骤为：导入考核结果时只显示参与排名的人员
+//            applyRankingFilter(true);
+
             importResultStep();
 
-            //步骤为：导入考核结果时只显示参与排名的人员
-            applyRankingFilter(true);
+
         }
     }
 
@@ -284,7 +305,7 @@ public class PerfRankMgmtFormPlugin extends AbstractFormPlugin implements Wizard
             }
         } else if(Arrays.asList(FormConstant.SAVE_OP, FormConstant.SUBMIT_OP).contains(itemKey)){
             //保存或提交先计算一遍
-             calcRankCount();
+            calcRankCount();
         } else if(FormConstant.DELETEENTRY_OP.equalsIgnoreCase(itemKey)){
             //校验人员考评，若考评周期已结束，则禁止删除。
             EntryGrid entryGrid = getView().getControl(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
@@ -299,8 +320,10 @@ public class PerfRankMgmtFormPlugin extends AbstractFormPlugin implements Wizard
                         DynamicObjectCollection entryEntity = this.getModel().getEntryEntity(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
                         DynamicObject rowData = entryEntity.get(rowIndex);
                         DynamicObject person = rowData.getDynamicObject(FormConstant.NCKD_PERSON);
-                        long personId = person.getLong(FormConstant.ID_KEY);
-                        personIds.add(personId);
+                        if(person != null) {
+                            long personId = person.getLong(FormConstant.ID_KEY);
+                            personIds.add(personId);
+                        }
                     }
 
                     if(!personIds.isEmpty()){
@@ -391,7 +414,7 @@ public class PerfRankMgmtFormPlugin extends AbstractFormPlugin implements Wizard
             if (evt.getResult() == MessageBoxResult.Yes) {
                 DynamicObjectCollection entryEntities = getModel().getEntryEntity(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
                 entryEntities.clear();
-                getModel().updateEntryCache(entryEntities);
+//                getModel().updateEntryCache(entryEntities);
                 getView().updateView(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
             }
         }
@@ -508,7 +531,7 @@ public class PerfRankMgmtFormPlugin extends AbstractFormPlugin implements Wizard
                             entryCol.set(PerfRankMgmtConstant.NCKD_POSTALLOWANCE, hasAllowance);
 
                         }
-                        this.getModel().updateEntryCache(entryEntityCols);
+//                        this.getModel().updateEntryCache(entryEntityCols);
                         this.getView().updateView(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
                         this.getView().showSuccessNotification("名单获取完成");
                     } else {
@@ -520,14 +543,19 @@ public class PerfRankMgmtFormPlugin extends AbstractFormPlugin implements Wizard
             if(afterDoOperationEventArgs.getOperationResult() != null && afterDoOperationEventArgs.getOperationResult().isSuccess()){
                 String wizadap = this.getView().getPageCache().get(FormConstant.NCKD_WIZARDAP);
                 if(StringUtils.isBlank(wizadap) || "0".equals(wizadap)){
-
-                    setStepStatus(0,Steps.FINISH);
+/*                    setStepStatus(0,Steps.FINISH);
                     setStepStatus(1,Steps.PROCESS);
                     //控制显示隐藏
                     importResultStep();
-                    applyRankingFilter(true);
+                    this.getView().updateView(PerfRankMgmtConstant.NCKD_STEP);*/
+                    this.getView().getPageCache().put(PerfRankMgmtConstant.NCKD_STEP, "1");
                     this.getView().invokeOperation(FormConstant.REFRESH_OP);
 
+/*                    //控制显示隐藏
+                    importResultStep();
+                    applyRankingFilter(true);*/
+
+
 
                 }else {
                     this.getView().showSuccessNotification("同步考核周期成功。");
@@ -545,13 +573,11 @@ public class PerfRankMgmtFormPlugin extends AbstractFormPlugin implements Wizard
         this.getModel().setValue(PerfRankMgmtConstant.NCKD_STEP,1);
         this.getView().setVisible(false, FormConstant.NUMBER_KEY, PerfRankMgmtConstant.NCKD_GETRANKLIST,"nckd_advconbaritemap2","nckd_advconbaritemap3");
         this.getView().setVisible(true, PerfRankMgmtConstant.NCKD_TOPRANKS, PerfRankMgmtConstant.NCKD_ALLOWANCERANKS, PerfRankMgmtConstant.NCKD_FAILS, PerfRankMgmtConstant.NCKD_BASICS, PerfRankMgmtConstant.NCKD_EXCELLENTS, "nckd_advconbaritemap6","nckd_advconbaritemap");
-        DynamicObjectCollection entryEntity = this.getModel().getEntryEntity(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
+        DynamicObjectCollection entryEntity = this.getModel().getDataEntity(true).getDynamicObjectCollection(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
         for (int i = 0; i < entryEntity.size(); i++) {
             this.getView().setEnable(Boolean.FALSE, i, FormConstant.NCKD_PERSON);
             this.getView().setEnable(Boolean.FALSE, i, PerfRankMgmtConstant.NCKD_ISRANKING);
         }
-        this.getModel().updateEntryCache(entryEntity);
-        this.getView().updateView(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
 
     }
 
@@ -559,7 +585,7 @@ public class PerfRankMgmtFormPlugin extends AbstractFormPlugin implements Wizard
         this.getModel().setValue(PerfRankMgmtConstant.NCKD_STEP,0);
         this.getView().setVisible(true, FormConstant.NUMBER_KEY, PerfRankMgmtConstant.NCKD_GETRANKLIST,"nckd_advconbaritemap2","nckd_advconbaritemap3");
         this.getView().setVisible(false, PerfRankMgmtConstant.NCKD_TOPRANKS, PerfRankMgmtConstant.NCKD_ALLOWANCERANKS, PerfRankMgmtConstant.NCKD_FAILS, PerfRankMgmtConstant.NCKD_BASICS, PerfRankMgmtConstant.NCKD_EXCELLENTS, "nckd_advconbaritemap6","nckd_advconbaritemap");
-        DynamicObjectCollection entryEntity = this.getModel().getEntryEntity(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
+        DynamicObjectCollection entryEntity = this.getModel().getDataEntity(true).getDynamicObjectCollection(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
         for (int i = 0; i < entryEntity.size(); i++) {
             this.getView().setEnable(Boolean.TRUE, i, FormConstant.NCKD_PERSON);
             this.getView().setEnable(Boolean.TRUE, i, PerfRankMgmtConstant.NCKD_ISRANKING);
@@ -661,7 +687,6 @@ public class PerfRankMgmtFormPlugin extends AbstractFormPlugin implements Wizard
     private void sortEntry(){
         DynamicObjectCollection entryEntityCols = this.getModel().getDataEntity(true).getDynamicObjectCollection(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
             if(!entryEntityCols.isEmpty()) {
-            int allowanceRank = entryEntityCols.get(0).getInt(PerfRankMgmtConstant.NCKD_ALLOWANCERANK);
             entryEntityCols.sort((o1, o2) -> {
                 // 先按 NCKD_TOPRANK 排序，空值或 0 视为最大值（排在最后）
                 Integer topRank1 = o1.getInt(PerfRankMgmtConstant.NCKD_TOPRANK);
@@ -698,8 +723,8 @@ public class PerfRankMgmtFormPlugin extends AbstractFormPlugin implements Wizard
                 Boolean isRanking2 = o2.getBoolean(PerfRankMgmtConstant.NCKD_ISRANKING);
                 return Boolean.compare(isRanking2, isRanking1);
             });
-            this.getModel().updateEntryCache(entryEntityCols);
-            this.getView().updateView(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
+/*            this.getModel().updateEntryCache(entryEntityCols);
+            this.getView().updateView(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);*/
         }
     }
 
@@ -711,7 +736,11 @@ public class PerfRankMgmtFormPlugin extends AbstractFormPlugin implements Wizard
      */
     private void calcRankCount(){
         DynamicObjectCollection entryEntity = this.getModel().getEntryEntity(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
-
+        Object value = this.getModel().getValue(PerfRankMgmtConstant.NCKD_TOPRANKS);
+        if(value != null && ConvertUtil.toInt( value) > 0){
+            //有值了就不计算
+            return;
+        }
         int totalRankCount = 0;
         int allowanceRankCount = 0;
         int failCount = 0;
@@ -795,10 +824,9 @@ public class PerfRankMgmtFormPlugin extends AbstractFormPlugin implements Wizard
         if(stepEvent.getValue() == 0){
             generatePersonList();
             setStepStatus(0, Steps.PROCESS);
-            this.getView().updateView(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
 
             //步骤为：导入考核结果时只显示参与排名的人员
-            applyRankingFilter(false);
+//            applyRankingFilter(false);
 
         }else{
             //校验有没有保存
@@ -809,10 +837,9 @@ public class PerfRankMgmtFormPlugin extends AbstractFormPlugin implements Wizard
             }else {
                 importResultStep();
                 setStepStatus(1, Steps.PROCESS);
-                this.getView().updateView(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
 
                 //步骤为：导入考核结果时只显示参与排名的人员
-                applyRankingFilter(true);
+//                applyRankingFilter(true);
             }
         }
         this.getView().updateView(PerfRankMgmtConstant.NCKD_STEP);
@@ -847,6 +874,7 @@ public class PerfRankMgmtFormPlugin extends AbstractFormPlugin implements Wizard
         filterRowList.add(new SimpleFilterRow("(", CompareTypeEnum.IN.getId(), "nckd_isranking", ")", "", value));
         //分录过滤
         entryGrid.getGridDataByDefaultFilterRow(filterRowList);
+        this.getView().updateView(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
     }
 
 }

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/operate/adjust/NewDynamicAdjustmentOperationPlugIn.java

@@ -256,7 +256,7 @@ public class NewDynamicAdjustmentOperationPlugIn extends AbstractOperationServic
         dep.set(FormConstant.ID_KEY, empPosOrgRel.getLong(String.join(".",FormConstant.ADMINORG,FormConstant.ID_KEY)));
         newPersonPosFile.set(PositionStructureConstant.USEORG_KEY, dep);*/
 
-        DynamicObject dep = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORGHR_ENTITYID);
+        DynamicObject dep = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORG_ENTITYID);
         dep.set(FormConstant.ID_KEY, empPosOrgRel.getLong(String.join(".",FormConstant.ADMINORG,FormConstant.ID_KEY)));
         newPersonPosFile.set(PositionStructureConstant.NCKD_DEP, dep);
 

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/operate/annualadjust/AnnualLockOrUnLockedOpPlugin.java

@@ -139,7 +139,7 @@ public class AnnualLockOrUnLockedOpPlugin extends AbstractOperationServicePlugIn
                 billObj.set(FormConstant.CREATOR_KEY, UserServiceHelper.getCurrentUserId());
                 billObj.set(FormConstant.CREATE_TIME_KEY, System.currentTimeMillis());
                 billObj.set(FormConstant.BILL_STATUS_KEY, BillStatus.A.toString());
-                DynamicObject org = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORGHR_ENTITYID);
+                DynamicObject org = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORG_ENTITYID);
                 org.set(FormConstant.ID_KEY, UserServiceHelper.getUserMainOrgId(UserServiceHelper.getCurrentUserId()));
                 billObj.set(FormConstant.ORG_KEY, org);
                 billObj.set(PositionStructureConstant.NCKD_REASON, reason);

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/operate/initial/BaseInitialOperationPlugIn.java

@@ -12,7 +12,6 @@ import kd.bos.logging.LogFactory;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
-import kd.bos.servicehelper.user.UserServiceHelper;
 import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.enums.AppraisalResultEnum;
 import nckd.jxccl.base.common.enums.psms.JobSeqEnum;
@@ -197,13 +196,13 @@ public abstract class BaseInitialOperationPlugIn extends AbstractOperationServic
 
             long companyId = empPosOrgRel.getLong(String.join(".", FormConstant.COMPANY_KEY, FormConstant.ID_KEY));
             if(companyId > 0) {
-                DynamicObject company = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORGHR_ENTITYID);
+                DynamicObject company = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORG_ENTITYID);
                 company.set(FormConstant.ID_KEY, companyId);
                 data.company = company;
             }
             long adminOrgId = empPosOrgRel.getLong(String.join(".", FormConstant.ADMINORG, FormConstant.ID_KEY));
             if(adminOrgId > 0) {
-                DynamicObject dep = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORGHR_ENTITYID);
+                DynamicObject dep = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORG_ENTITYID);
                 dep.set(FormConstant.ID_KEY, adminOrgId);
                 data.dep = dep;
             }

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/operate/performance/PerfrankMgmtLockOrUnLockedOpPlugin.java

@@ -133,7 +133,7 @@ public class PerfrankMgmtLockOrUnLockedOpPlugin extends AbstractOperationService
                 billObj.set(FormConstant.CREATE_TIME_KEY, System.currentTimeMillis());
                 billObj.set(FormConstant.BILL_STATUS_KEY, BillStatus.A.toString());
                 billObj.set(FormConstant.AUDIT_STATUS, BillStatus.B.toString());
-                DynamicObject org = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORGHR_ENTITYID);
+                DynamicObject org = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORG_ENTITYID);
                 org.set(FormConstant.ID_KEY, UserServiceHelper.getUserMainOrgId(UserServiceHelper.getCurrentUserId()));
                 billObj.set(FormConstant.ORG_KEY, org);
                 billObj.set(PositionStructureConstant.NCKD_REASON, reason);

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/sdm/plugin/form/SanDingPlanFormPlugin.java

@@ -124,7 +124,7 @@ public class SanDingPlanFormPlugin extends AbstractFormPlugin {
             managerIds.add(managerId);
         }
         // 获取单位数据
-        DynamicObject[] companyDyos = HRBaseServiceHelper.create(SanDingConstant.ADMINORGHR_ENTITYID).load(new QFilter[]{QFilterCommonHelper.getIdInFilter(companyIds)});
+        DynamicObject[] companyDyos = HRBaseServiceHelper.create(SanDingConstant.ADMINORG_ENTITYID).load(new QFilter[]{QFilterCommonHelper.getIdInFilter(companyIds)});
         Map<Long, DynamicObject> companyMap = Arrays.stream(companyDyos).collect(Collectors.toMap(companyDyo -> companyDyo.getLong(SanDingConstant.ID_KEY), Function.identity(), (oldValue, newValue) -> newValue));
         // 获取负责任人数据
         DynamicObject[] managerDyos = HRBaseServiceHelper.create(SanDingConstant.HRPI_EMPLOYEE).load(new QFilter[]{QFilterCommonHelper.getIdInFilter(managerIds)});

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/sdm/plugin/operate/SendTaskOpPlugin.java

@@ -25,7 +25,6 @@ import kd.bos.servicehelper.operation.SaveServiceHelper;
 import kd.bos.servicehelper.user.UserServiceHelper;
 import kd.bos.url.UrlService;
 import kd.bos.workflow.engine.msg.info.MessageInfo;
-import kd.drp.mdr.common.enums.Enable;
 import kd.hr.hbp.business.servicehelper.HRBaseServiceHelper;
 import kd.hr.hbp.business.servicehelper.HRQueryEntityHelper;
 import kd.hr.hbp.common.constants.history.HisModelDataStatusEnum;
@@ -335,7 +334,7 @@ public class SendTaskOpPlugin extends AbstractOperationServicePlugIn {
                 // 岗位BOID
                 Long positionBoId = positionOrgMap.get("positionBoId");
                 // 设置 组织
-                sanDingTaskEntryDyo.set(SanDingConstant.NCKD_ADMINORG, EntityHelper.newEntity(SanDingConstant.ADMINORGHR_ENTITYID, positionOrgMap.get("adminOrgSourceVid")));
+                sanDingTaskEntryDyo.set(SanDingConstant.NCKD_ADMINORG, EntityHelper.newEntity(SanDingConstant.ADMINORG_ENTITYID, positionOrgMap.get("adminOrgSourceVid")));
                 // 设置 岗位
                 sanDingTaskEntryDyo.set(SanDingConstant.NCKD_POSITION_KEY, EntityHelper.newEntity(SanDingConstant.HBPM_POSITIONHR, positionOrgMap.get("positionSourceVid")));
                 // 设置 定员数

code/hrmp/nckd-jxccl-hrmp/src/main/java/nckd/jxccl/hrmp/haos/plugin/operate/adminorg/AdminOrgDetailConfirmChangeOpPlugin.java

@@ -69,7 +69,7 @@ public class AdminOrgDetailConfirmChangeOpPlugin extends AbstractOperationServic
         Arrays.stream(dataEntities).map(dataEntity -> dataEntity.getString(AdminOrgConstant.STRUCTLONGNUMBER)+"%").forEach(structlongnumber -> {
             qFilter.or(QFilter.like(AdminOrgConstant.STRUCTLONGNUMBER, structlongnumber));
         });
-        adminOrgOldDyColl = QueryServiceHelper.query(AdminOrgConstant.ADMINORGHR_ENTITYID, AdminOrgConstant.BOID_KEY, new QFilter[]{QFilter.isNotNull(AdminOrgConstant.STRUCTLONGNUMBER).and(qFilter).and(QFilterCommonHelper.getCurrentVersionFilter())});
+        adminOrgOldDyColl = QueryServiceHelper.query(AdminOrgConstant.ADMINORG_ENTITYID, AdminOrgConstant.BOID_KEY, new QFilter[]{QFilter.isNotNull(AdminOrgConstant.STRUCTLONGNUMBER).and(qFilter).and(QFilterCommonHelper.getCurrentVersionFilter())});
     }
 
     @Override
@@ -101,7 +101,7 @@ public class AdminOrgDetailConfirmChangeOpPlugin extends AbstractOperationServic
         List<Long> adminOrgBoIds = adminOrgOldDyColl.stream().map(adminOrg -> adminOrg.getLong(AdminOrgConstant.BOID_KEY)).collect(Collectors.toList());
         String selectProperties = String.join(",", AdminOrgConstant.BOID_KEY, AdminOrgConstant.STRUCTLONGNUMBER, AdminOrgConstant.LEVEL, String.join(",", AdminOrgConstant.ADMINORG_STRUCT_FIELDS));
         QFilter qFilter = QFilter.isNotNull(AdminOrgConstant.STRUCTLONGNUMBER).and(new QFilter(AdminOrgConstant.STRUCTLONGNUMBER, QCP.not_equals, "")).and(new QFilter(AdminOrgConstant.BOID_KEY, QCP.in, adminOrgBoIds));
-        DynamicObject[] adminOrgDys = BusinessDataServiceHelper.load(AdminOrgConstant.ADMINORGHR_ENTITYID, selectProperties, new QFilter[]{qFilter}, AdminOrgConstant.BOID_KEY);
+        DynamicObject[] adminOrgDys = BusinessDataServiceHelper.load(AdminOrgConstant.ADMINORG_ENTITYID, selectProperties, new QFilter[]{qFilter}, AdminOrgConstant.BOID_KEY);
         // 遍历获取结构编码
         Map<String, String> structMap = Arrays.stream(adminOrgDys)
                 .map(adminOrgDy -> adminOrgDy.getString(AdminOrgConstant.STRUCTLONGNUMBER))
@@ -113,7 +113,7 @@ public class AdminOrgDetailConfirmChangeOpPlugin extends AbstractOperationServic
                 ));
 
         // 根据结构编码获取组织
-        DynamicObjectCollection adminOrgDyColl = QueryServiceHelper.query(AdminOrgConstant.ADMINORGHR_ENTITYID, String.join(",", AdminOrgConstant.BOID_KEY, AdminOrgConstant.STRUCTNUMBER), new QFilter[]{new QFilter(AdminOrgConstant.STRUCTNUMBER, QCP.in, new ArrayList<String>(structMap.keySet())).and(QFilterCommonHelper.getCurrentVersionFilter())}, String.join(",", AdminOrgConstant.LEVEL, AdminOrgConstant.NUMBER_KEY));
+        DynamicObjectCollection adminOrgDyColl = QueryServiceHelper.query(AdminOrgConstant.ADMINORG_ENTITYID, String.join(",", AdminOrgConstant.BOID_KEY, AdminOrgConstant.STRUCTNUMBER), new QFilter[]{new QFilter(AdminOrgConstant.STRUCTNUMBER, QCP.in, new ArrayList<String>(structMap.keySet())).and(QFilterCommonHelper.getCurrentVersionFilter())}, String.join(",", AdminOrgConstant.LEVEL, AdminOrgConstant.NUMBER_KEY));
         adminOrgDyColl.forEach(adminOrgDy -> structMap.put(adminOrgDy.getString(AdminOrgConstant.STRUCTNUMBER), adminOrgDy.getString(AdminOrgConstant.BOID_KEY)));
 
         // 更新一二三四五六级组织
@@ -153,7 +153,7 @@ public class AdminOrgDetailConfirmChangeOpPlugin extends AbstractOperationServic
         // 存放关联历史版本ID和要更新的字段以及值
         Map<Long, String> sourceIdMap = new HashMap<Long, String>();
         // 查询需要更新的组织(当前版本含本身)
-        DynamicObject[] adminOrgDys = BusinessDataServiceHelper.load(AdminOrgConstant.ADMINORGHR_ENTITYID, selectProperties, new QFilter[]{qFilter}, String.join(",", AdminOrgConstant.LEVEL, AdminOrgConstant.NUMBER_KEY));
+        DynamicObject[] adminOrgDys = BusinessDataServiceHelper.load(AdminOrgConstant.ADMINORG_ENTITYID, selectProperties, new QFilter[]{qFilter}, String.join(",", AdminOrgConstant.LEVEL, AdminOrgConstant.NUMBER_KEY));
         for (DynamicObject adminOrgDy : adminOrgDys) {
             for (String structNumber : structNumberMap.keySet()) {
                 if (adminOrgDy.getString(AdminOrgConstant.STRUCTLONGNUMBER).contains(structNumber)) {
@@ -169,7 +169,7 @@ public class AdminOrgDetailConfirmChangeOpPlugin extends AbstractOperationServic
 
         // 查询出历史版本记录
         Set<Long> sourceIds = new HashSet<>(sourceIdMap.keySet());
-        DynamicObject[] adminOrgHisDys = BusinessDataServiceHelper.load(AdminOrgConstant.ADMINORGHR_ENTITYID, String.join(",", AdminOrgConstant.STRUCTLONGNUMBER, adminOrgStructField), new QFilter[]{new QFilter(AdminOrgConstant.ID_KEY, QCP.in, sourceIds)}, String.join(",", AdminOrgConstant.LEVEL, AdminOrgConstant.NUMBER_KEY));
+        DynamicObject[] adminOrgHisDys = BusinessDataServiceHelper.load(AdminOrgConstant.ADMINORG_ENTITYID, String.join(",", AdminOrgConstant.STRUCTLONGNUMBER, adminOrgStructField), new QFilter[]{new QFilter(AdminOrgConstant.ID_KEY, QCP.in, sourceIds)}, String.join(",", AdminOrgConstant.LEVEL, AdminOrgConstant.NUMBER_KEY));
         for (DynamicObject adminOrgHisDy : adminOrgHisDys) {
             String[] sourceId = sourceIdMap.get(adminOrgHisDy.getLong(AdminOrgConstant.ID_KEY)).split("@");
             // 判断是否此次变更的组织

code/hrmp/nckd-jxccl-hrmp/src/main/java/nckd/jxccl/hrmp/haos/plugin/operate/adminorg/AdminOrgDetailSaveOpPlugin.java

@@ -11,7 +11,6 @@ import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
 import nckd.jxccl.hrmp.haos.common.adminorg.AdminOrgConstant;
 
 import java.util.Arrays;
-import java.util.stream.IntStream;
 
 /**
  * 组织快速维护保存操作插件
@@ -38,7 +37,7 @@ public class AdminOrgDetailSaveOpPlugin extends AbstractOperationServicePlugIn {
         String[] structNumbers = dataEntity.getString(AdminOrgConstant.STRUCTLONGNUMBER).split("!");
         // 过滤组织上下级关系编码和是否当前生效数据
         QFilter[] qFilters = {new QFilter(AdminOrgConstant.STRUCTNUMBER, QCP.in, Arrays.asList(structNumbers)), QFilterCommonHelper.getCurrentVersionFilter()};
-        DynamicObjectCollection adminOrgColl = QueryServiceHelper.query(AdminOrgConstant.ADMINORGHR_ENTITYID, AdminOrgConstant.ID_KEY, qFilters, AdminOrgConstant.LEVEL);
+        DynamicObjectCollection adminOrgColl = QueryServiceHelper.query(AdminOrgConstant.ADMINORG_ENTITYID, AdminOrgConstant.ID_KEY, qFilters, AdminOrgConstant.LEVEL);
         for (int i = 0; i < AdminOrgConstant.ADMINORG_STRUCT_FIELDS.length; i++) {
             if (i < adminOrgColl.size() && adminOrgColl.get(i) != null) {
             dataEntity.set(AdminOrgConstant.ADMINORG_STRUCT_FIELDS[i], adminOrgColl.get(i).getLong(AdminOrgConstant.ID_KEY));

code/hrmp/nckd-jxccl-hrmp/src/main/java/nckd/jxccl/hrmp/hbpm/plugin/operate/hr/PosBillEntryAddSaveOpPlugin.java

@@ -71,7 +71,7 @@ public class PosBillEntryAddSaveOpPlugin extends AbstractOperationServicePlugIn
             dbPositionMap.put(positionDyo.getLong(PositionBillConstant.ID_KEY), positionDyo);
         }
         // 根据组织BOID从数据库中获取组织信息
-        DynamicObject[] adminOrgDyos = HRBaseServiceHelper.create(PositionBillConstant.ADMINORGHR_ENTITYID).loadDynamicObjectArray(new QFilter[]{new QFilter(PositionBillConstant.ID_KEY, QCP.in, adminorgBoIds)});
+        DynamicObject[] adminOrgDyos = HRBaseServiceHelper.create(PositionBillConstant.ADMINORG_ENTITYID).loadDynamicObjectArray(new QFilter[]{new QFilter(PositionBillConstant.ID_KEY, QCP.in, adminorgBoIds)});
         Map<Long, DynamicObject> dbAdminOrgMap = Maps.newHashMapWithExpectedSize(adminOrgDyos.length);
         for (DynamicObject adminOrgDyo : adminOrgDyos) {
             dbAdminOrgMap.put(adminOrgDyo.getLong(PositionBillConstant.BOID_KEY), adminOrgDyo);

code/opmc/nckd-jxccl-opmc/src/main/java/nckd/jxccl/opmc/pm/plugin/operate/cycle/CycleGenerateOpPlugin.java

@@ -12,7 +12,6 @@ import kd.bos.dataentity.OperateOption;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.entity.EntityMetadataCache;
-import kd.bos.entity.MainEntityType;
 import kd.bos.entity.QueryEntityType;
 import kd.bos.entity.operate.OperateOptionConst;
 import kd.bos.entity.operate.result.IOperateInfo;
@@ -23,7 +22,6 @@ import kd.bos.logging.Log;
 import kd.bos.logging.LogFactory;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
-import kd.bos.servicehelper.basedata.BaseDataServiceHelper;
 import kd.bos.servicehelper.operation.OperationServiceHelper;
 import kd.hr.hbp.business.servicehelper.HRQueryEntityHelper;
 import kd.hr.hbp.common.model.AuthorizedOrgResultWithSub;
@@ -38,9 +36,7 @@ import nckd.jxccl.base.common.utils.DateUtil;
 import nckd.jxccl.base.common.utils.QueryFieldBuilder;
 import nckd.jxccl.base.common.utils.StrFormatter;
 import nckd.jxccl.base.entity.helper.EntityHelper;
-import nckd.jxccl.base.org.helper.OrgHelper;
 import nckd.jxccl.opmc.pm.common.PerfManagerFormConstant;
-import nckd.jxccl.opmc.pm.common.SalAdjTrackerConstant;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -338,7 +334,7 @@ public class CycleGenerateOpPlugin extends AbstractOperationServicePlugIn implem
                 DynamicObject empPosOrgRel = EntityHelper.newEntity(FormConstant.HRPI_EMPPOSORGREL);
                 empPosOrgRel.set(FormConstant.ID_KEY, empPosOrgRelId);
 
-                DynamicObject adminOrg = EntityHelper.newEntity(FormConstant.ADMINORGHR_ENTITYID);
+                DynamicObject adminOrg = EntityHelper.newEntity(FormConstant.ADMINORG_ENTITYID);
                 adminOrg.set(FormConstant.ID_KEY, adminOrgId);
 
                 String personName = person.getString(String.join(".", FormConstant.HRPI_EMPLOYEE, FormConstant.NAME_KEY));
@@ -388,7 +384,7 @@ public class CycleGenerateOpPlugin extends AbstractOperationServicePlugIn implem
             DynamicObject empPosOrgRel = EntityHelper.newEntity(FormConstant.HRPI_EMPPOSORGREL);
             empPosOrgRel.set(FormConstant.ID_KEY, empPosOrgRelId);
 
-            DynamicObject adminOrg = EntityHelper.newEntity(FormConstant.ADMINORGHR_ENTITYID);
+            DynamicObject adminOrg = EntityHelper.newEntity(FormConstant.ADMINORG_ENTITYID);
             adminOrg.set(FormConstant.ID_KEY, adminOrgId);
 
             DynamicObject person = EntityHelper.newEntity(FormConstant.HRPI_EMPLOYEE);
@@ -478,7 +474,7 @@ public class CycleGenerateOpPlugin extends AbstractOperationServicePlugIn implem
             DynamicObject empPosOrgRel = EntityHelper.newEntity(FormConstant.HRPI_EMPPOSORGREL);
             empPosOrgRel.set(FormConstant.ID_KEY, personIdAndEmpPosOrgRelMap.get(filteredPersonId));
 
-            DynamicObject adminOrg = EntityHelper.newEntity(FormConstant.ADMINORGHR_ENTITYID);
+            DynamicObject adminOrg = EntityHelper.newEntity(FormConstant.ADMINORG_ENTITYID);
             adminOrg.set(FormConstant.ID_KEY, personIdAndAdminOrgMap.get(filteredPersonId));
 
             DynamicObject person = EntityHelper.newEntity(FormConstant.HRPI_EMPLOYEE);
@@ -527,7 +523,7 @@ public class CycleGenerateOpPlugin extends AbstractOperationServicePlugIn implem
                 DynamicObject empPosOrgRel = EntityHelper.newEntity(FormConstant.HRPI_EMPPOSORGREL);
                 empPosOrgRel.set(FormConstant.ID_KEY, empPosOrgRelId);
 
-                DynamicObject adminOrg = EntityHelper.newEntity(FormConstant.ADMINORGHR_ENTITYID);
+                DynamicObject adminOrg = EntityHelper.newEntity(FormConstant.ADMINORG_ENTITYID);
                 adminOrg.set(FormConstant.ID_KEY, adminOrgId);
 
                 DynamicObject person = EntityHelper.newEntity(FormConstant.HRPI_EMPLOYEE);

code/opmc/nckd-jxccl-opmc/src/main/java/nckd/jxccl/opmc/pm/plugin/operate/salary/SalaryAdjOpPlugin.java

@@ -407,7 +407,7 @@ public class SalaryAdjOpPlugin extends AbstractOperationServicePlugIn implements
                         newSalAdjTracker.set(SalAdjTrackerConstant.NCKD_OLDSTANDARDITEM, result.oldStandardItem);
                         newSalAdjTracker.set(SalAdjTrackerConstant.NCKD_STANDARDITEM, result.oldStandardItem);
                         newSalAdjTracker.set(SalAdjTrackerConstant.NCKD_ADJMONEY, result.amount.subtract(result.oldAmount));
-                        newSalAdjTracker.set(SalAdjTrackerConstant.NCKD_DEP, EntityHelper.newEntity(FormConstant.ADMINORGHR_ENTITYID, result.depId));
+                        newSalAdjTracker.set(SalAdjTrackerConstant.NCKD_DEP, EntityHelper.newEntity(FormConstant.ADMINORG_ENTITYID, result.depId));
                         newSalAdjTracker.set(SalAdjTrackerConstant.NCKD_POSITION, EntityHelper.newEntity(PerfManagerFormConstant.HBPM_POSITIONHR, result.positionId));
                         newSalAdjTracker.set(SalAdjTrackerConstant.CREATOR_KEY, UserServiceHelper.getCurrentUserId());
                         ids.add(result.id);

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/empmgt/SubCoHeadServiceListPlugin.java

@@ -10,14 +10,11 @@ import kd.bos.entity.constant.StatusEnum;
 import kd.bos.entity.operate.result.OperationResult;
 import kd.bos.form.CloseCallBack;
 import kd.bos.form.FormShowParameter;
-import kd.bos.form.IFormView;
-import kd.bos.form.IPageCache;
 import kd.bos.form.MessageBoxOptions;
 import kd.bos.form.ShowType;
 import kd.bos.form.events.AfterDoOperationEventArgs;
 import kd.bos.form.events.ClosedCallBackEvent;
 import kd.bos.list.plugin.AbstractListPlugin;
-import kd.bos.mvc.SessionManager;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.QueryServiceHelper;
@@ -350,7 +347,7 @@ public class SubCoHeadServiceListPlugin extends AbstractListPlugin implements Pl
                 }
                 //所属二级单位（发薪单位）
                 long payOrgId = partyPosh.getLong(String.join(".", MasConstant.NCKD_PAYUNIT, FormConstant.ID_KEY));
-                DynamicObject payOrg = EntityHelper.newEntity(FormConstant.ADMINORGHR_ENTITYID, payOrgId);
+                DynamicObject payOrg = EntityHelper.newEntity(FormConstant.ADMINORG_ENTITYID, payOrgId);
                 newSubCoHeadService.set(MasConstant.NCKD_PAYUNIT, payOrg);
                 //职务
                 newSubCoHeadService.set(MasConstant.NCKD_POSNAME,partyPosh.getString(MasConstant.NCKD_POSNAME));

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/empmgt/TenurePersonListListPlugin.java

@@ -10,14 +10,11 @@ import kd.bos.entity.constant.StatusEnum;
 import kd.bos.entity.operate.result.OperationResult;
 import kd.bos.form.CloseCallBack;
 import kd.bos.form.FormShowParameter;
-import kd.bos.form.IFormView;
-import kd.bos.form.IPageCache;
 import kd.bos.form.MessageBoxOptions;
 import kd.bos.form.ShowType;
 import kd.bos.form.events.AfterDoOperationEventArgs;
 import kd.bos.form.events.ClosedCallBackEvent;
 import kd.bos.list.plugin.AbstractListPlugin;
-import kd.bos.mvc.SessionManager;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.QueryServiceHelper;
@@ -292,7 +289,7 @@ public class TenurePersonListListPlugin extends AbstractListPlugin implements Pl
                 }
                 //所属二级单位（发薪单位）
                 long payOrgId = partyPosh.getLong(String.join(".", MasConstant.NCKD_PAYUNIT, FormConstant.ID_KEY));
-                DynamicObject payOrg = EntityHelper.newEntity(FormConstant.ADMINORGHR_ENTITYID, payOrgId);
+                DynamicObject payOrg = EntityHelper.newEntity(FormConstant.ADMINORG_ENTITYID, payOrgId);
                 newSubCoHeadService.set(MasConstant.NCKD_PAYUNIT, payOrg);
                 //职务
                 newSubCoHeadService.set(MasConstant.NCKD_POSNAME,partyPosh.getString(MasConstant.NCKD_POSNAME));

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/business/StmService.java

@@ -37,7 +37,7 @@ public class StmService {
     }
 
     public static DynamicObjectCollection corp(DynamicObject org){
-        DynamicObject adminOrgHr = BusinessDataServiceHelper.loadSingle(FormConstant.ADMINORGHR_ENTITYID, FormConstant.STRUCTLONGNUMBER, new QFilter[]{QFilterCommonHelper.getIdEqFilter(org.getLong(FormConstant.ID_KEY))});
+        DynamicObject adminOrgHr = BusinessDataServiceHelper.loadSingle(FormConstant.ADMINORG_ENTITYID, FormConstant.STRUCTLONGNUMBER, new QFilter[]{QFilterCommonHelper.getIdEqFilter(org.getLong(FormConstant.ID_KEY))});
         QFilter filter = QFilter.like(FormConstant.STRUCTLONGNUMBER, adminOrgHr.getString(FormConstant.STRUCTLONGNUMBER) + "%")
                 .and("corporateorg", QCP.is_notnull,null)
                 .and(QFilterCommonHelper.getCurrentVersionFilter())
@@ -48,7 +48,7 @@ public class StmService {
         QueryFieldBuilder queryFieldBuilder = QueryFieldBuilder.create()
                 .addIdNumberName("corporateorg")
                 .add(FormConstant.ID_KEY);
-        DynamicObjectCollection query = QueryServiceHelper.query(FormConstant.ADMINORGHR_ENTITYID, queryFieldBuilder.buildSelect(), new QFilter[]{filter});
+        DynamicObjectCollection query = QueryServiceHelper.query(FormConstant.ADMINORG_ENTITYID, queryFieldBuilder.buildSelect(), new QFilter[]{filter});
         return query;
     }
 }

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/unitst/UnitStBudgetApplyFormPlugin.java

@@ -75,7 +75,7 @@ public class UnitStBudgetApplyFormPlugin extends AbstractFormPlugin implements P
                     ListShowParameter listParameter = new ListShowParameter();
                     listParameter.setFormId("bos_list");
 //                    listParameter.setFormId("haos_orgtreelistf7");
-                    listParameter.setBillFormId("haos_adminorghr");
+                    listParameter.setBillFormId("haos_adminorghrf7");
                     listParameter.setCaption(StrFormatter.format("【{}】下的法人企业",org.getString(FormConstant.NAME_KEY)));
                     listParameter.getOpenStyle().setShowType(ShowType.Modal);
                     StyleCss inlineStyleCss = new StyleCss();