Merge branch 'refs/heads/feat-hr-psms_1.0'

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

@@ -432,10 +432,13 @@ public class ManagerAllowanceService {
      */
     private static void saveChanges(List<DynamicObject> addOrExpireMgrPostAllowList) {
         if (!addOrExpireMgrPostAllowList.isEmpty()) {
+            OperateOption option = OperateOption.create();
+            // 跳过状态校验
+            option.setVariableValue("forceNoAudit","true");
             OperationResult operationResult = SaveServiceHelper.saveOperate(
                     PositionStructureConstant.MANAGERALLOWANCE_ENTITYID,
                     addOrExpireMgrPostAllowList.toArray(new DynamicObject[0]),
-                    OperateOption.create());
+                    option);
 
             if (!operationResult.isSuccess()) {
                 StringJoiner errorMsg = new StringJoiner("\n");

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/operate/other/ManagerAllowanceSaveOp.java

@@ -39,12 +39,6 @@ public class ManagerAllowanceSaveOp extends AbstractOperationServicePlugIn imple
         e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet());
     }
 
-    @Override
-    public void onAddValidators(AddValidatorsEventArgs e) {
-        //修改和删除不校验是否是暂存状态（只能修改暂存的数据。只能删除暂存的数据。）
-        this.operateOption.setVariableValue("forceNoAudit","true");
-    }
-
     @Override
     public void beginOperationTransaction(BeginOperationTransactionArgs e) {
         String variableValue = this.getOption().getVariableValue("importtype", "false");

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/operate/structappr/change/AbstractSalaryStdChgOpPlugin.java

@@ -104,11 +104,11 @@ public abstract class AbstractSalaryStdChgOpPlugin extends AbstractOperationServ
         }
 
         // 执行取消提交操作
-        OperationResult unsubmitResult = OperationServiceHelper.executeOperate("unsubmit", getEntityId(), load,OperateOption.create());
-        if (unsubmitResult.isSuccess()) {
+       /* OperationResult unsubmitResult = OperationServiceHelper.executeOperate("unsubmit", getEntityId(), load,OperateOption.create());
+        if (unsubmitResult.isSuccess()) {*/
             OperateOption option = OperateOption.create();
-            // 跳过状态校验
-            option.setVariableValue("rmStatusControl", "true");
+            //修改和删除不校验是否是暂存状态（只能修改暂存的数据。只能删除暂存的数据。）
+            option.setVariableValue("forceNoAudit","true");
             
             // 执行保存操作
             OperationResult saveResult = SaveServiceHelper.saveOperate(getEntityId(), load, option);
@@ -121,8 +121,8 @@ public abstract class AbstractSalaryStdChgOpPlugin extends AbstractOperationServ
             if (submitResult != null && !submitResult.isSuccess()) {
                 throw new ValidationException(StrFormatter.format("回写【{}】失败，原因：{}",getEntityName(),submitResult.getMessage()));
             }
-        } else {
+        /*} else {
             throw new ValidationException(StrFormatter.format("回写【{}】失败，原因：{}",getEntityName(),unsubmitResult.getMessage()));
-        }
+        }*/
     }
 }