Merge remote-tracking branch 'origin/master'

src/main/java/fi/em/formPlugin/SalaryDataSelectPlugin.java

@@ -23,24 +23,6 @@ import java.util.EventObject;
 public class SalaryDataSelectPlugin extends AbstractFormPlugin {
 
 
-    public static String selectdata="selectdata";
-
-//    //点击按钮弹窗选择数据
-//    public void afterDoOperation(AfterDoOperationEventArgs arg) {
-//        super.afterDoOperation(arg);
-//        AbstractOperate op = (AbstractOperate)arg.getSource();
-//        OperationResult operationResult = arg.getOperationResult();
-//        String key = op.getOperateKey();
-//        if (selectdata.equals(key)) {
-//            ListShowParameter listShowParameter = new ListShowParameter();
-//            listShowParameter.setFormId("bos_list");
-//            listShowParameter.setBillFormId("nckd_salarydis");
-//            listShowParameter.getOpenStyle().setShowType(ShowType.Modal);
-//            this.getView().showForm(listShowParameter);
-//
-//        }
-//    }
-
     @Override
     public void registerListener(EventObject e) {
         super.registerListener(e);
@@ -59,11 +41,10 @@ public class SalaryDataSelectPlugin extends AbstractFormPlugin {
         if (StringUtils.equalsIgnoreCase("nckd_selectdata", key)) {
             //薪酬计提数据
             ListShowParameter parameter = ShowFormHelper.createShowListForm("nckd_salarydis", false);
+            parameter.getListFilterParameter().setOrderBy("nckd_bizdate Desc");
             getView().showForm(parameter);
         }
         super.click(evt);
-
-
     }
 
 

src/main/java/sys/sc/formplugin/TestPlugin.java

@@ -309,8 +309,16 @@ public class TestPlugin  extends AbstractListPlugin {
                     }
                     //更新部门和岗位
                     DynamicObjectCollection existingDeptEntries = existingUser.getDynamicObjectCollection("entryentity");
-                    //人员部门分录
-                    DynamicObject existingDeptEntry = existingDeptEntries.isEmpty() ? null : existingDeptEntries.get(0);
+                    DynamicObject existingDeptEntry =null;
+                    for (DynamicObject dep:existingDeptEntries) {
+                        //改变分录不是兼职的分录数据
+                        if (!dep.getBoolean("ispartjob")){
+                            //人员部门分录
+                            existingDeptEntry = dep;
+                        }
+                    }
+//                    //人员部门分录
+//                    DynamicObject existingDeptEntry = existingDeptEntries.isEmpty() ? null : existingDeptEntries.get(0);
                     // 获取新的部门信息
                     String deptCode = personData.getString("nckd_orgidcode");
                     DynamicObject newOrgInfo = BusinessDataServiceHelper.loadSingle(

src/main/java/sys/sc/task/UpdateDataDailyTask.java

@@ -349,8 +349,16 @@ public class UpdateDataDailyTask extends AbstractTask {
                 }
                 //更新部门和岗位
                 DynamicObjectCollection existingDeptEntries = existingUser.getDynamicObjectCollection("entryentity");
+                DynamicObject existingDeptEntry =null;
+                for (DynamicObject dep:existingDeptEntries) {
+                    //改变分录不是兼职的分录数据
+                    if (!dep.getBoolean("ispartjob")){
+                        //人员部门分录
+                        existingDeptEntry = dep;
+                    }
+                }
                 //人员部门分录
-                DynamicObject existingDeptEntry = existingDeptEntries.isEmpty() ? null : existingDeptEntries.get(0);
+//                DynamicObject existingDeptEntry = existingDeptEntries.isEmpty() ? null : existingDeptEntries.get(0);
                 // 获取新的部门信息
                 String deptCode = personData.getString("nckd_orgidcode");
                 DynamicObject newOrgInfo = BusinessDataServiceHelper.loadSingle(