Merge remote-tracking branch 'origin/master'

nckd-cosmic-debug/src/main/java/nckd/cosmic/debug/LauncherByCl.java

@@ -1,4 +1,4 @@
-package kd.cosmic.server;
+package nckd.cosmic.debug;
 
 import kd.bos.config.client.util.ConfigUtils;
 import kd.bos.service.webserver.JettyServer;

nckd-hr/src/main/java/nckd/hr/swc/form/CalPayRollPayListPlugin.java

@@ -135,7 +135,7 @@ public class CalPayRollPayListPlugin extends AbstractListPlugin {
                         salaryExpenses.set("nckd_currency",regBillObj.getDynamicObject("payrollgroupv").get("currency"));
                         DynamicObjectCollection entryentity = salaryExpenses.getDynamicObjectCollection("entryentity");
                         entryentity.clear();
-                        // 核算列表
+                        // 核算列表对象
                         dynamicObjects.forEach(e -> {
                             // 获取核算名单信息
                             DynamicObject hsasCalperson = collect.get(e.get("calpersonid"));
@@ -146,9 +146,9 @@ public class CalPayRollPayListPlugin extends AbstractListPlugin {
                                 BigDecimal calamountvalue = dynamicObject.getBigDecimal("calamountvalue");
 
                                 if(ObjectUtils.equals(o,true) && calamountvalue.compareTo(BigDecimal.ZERO)>0){
-                                    DynamicObject dynamicObject1 = entryentity.addNew();
+                                    DynamicObject entry = entryentity.addNew();
                                     //  薪酬列表数据构建分录数据
-                                    initEntry(hsasCalperson,dynamicObject,dynamicObject1);
+                                    initEntry(hsasCalperson,dynamicObject,entry);
                                 }
                             }
                         });

nckd-pur/src/main/java/nckd/pur/scp/plugin/form/PurApplyBillPlugin.java

@@ -27,7 +27,7 @@ public class PurApplyBillPlugin extends AbstractBillPlugIn implements BeforeF7Se
             boolean jjcg = (boolean) this.getModel().getValue("nckd_jjcg");
             boolean xgm = (boolean) this.getModel().getValue("nckd_xgm");
             String value = (String)this.getModel().getValue("nckd_combofield");
-            if (jjcg || xgm || "1".equals(value)) {
+            if (jjcg || xgm || "是".equals(value))  {
                 QFilter mtQf = new QFilter("masterid.nckd_centralized",QCP.equals,true);
                 evt.getCustomQFilters().add(mtQf);
             }