Przeglądaj źródła

fix(incentive): 解决分期年份为空时的空指针异常

- 在 AbstractIncentiveApprFormPlugin 中添加分期年份字段空值检查
- 在 EntldrTermBonusApprFormPlugin 中添加分期年份字段空值检查
- 在 AbstractSalaryStdChgFormPlugin 中添加分期年份字段空值检查
- 在 EntleaderAnlSalStdFormPlugin 中添加分期年份字段空值检查
- 在 SubcorpChiefSalStdFormPlugin 中添加分期年份字段空值检查
- 防止在分期年份字段为 null 时调用 getInt 方法导致异常
wyc 4 dni temu
rodzic
commit
ad572aeef8

+ 4 - 2
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/incentivemgmt/AbstractIncentiveApprFormPlugin.java

@@ -110,8 +110,10 @@ public abstract class AbstractIncentiveApprFormPlugin extends AbstractFormPlugin
             for (int rowIndex = 0; rowIndex < entryEntities.size(); rowIndex++) {
                 DynamicObject entry = entryEntities.get(rowIndex);
                 if(entry.getDataEntityType().getProperties().containsKey(MasConstant.NCKD_INSTALLMENTYEARS)) {
-                    int installmentYears = entry.getInt(MasConstant.NCKD_INSTALLMENTYEARS);
-                    initOperateOption(installmentYears, rowIndex);
+                    if(entry.get(MasConstant.NCKD_INSTALLMENTYEARS) != null) {
+                        int installmentYears = entry.getInt(MasConstant.NCKD_INSTALLMENTYEARS);
+                        initOperateOption(installmentYears, rowIndex);
+                    }
                 }
             }
             

+ 4 - 2
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/incentivemgmt/EntldrTermBonusApprFormPlugin.java

@@ -29,8 +29,10 @@ public class EntldrTermBonusApprFormPlugin extends AbstractIncentiveApprFormPlug
         DynamicObjectCollection entryCollection = this.getModel().getEntryEntity(FormConstant.NCKD_ENTRYENTITY);
         for (int rowIndex = 0; rowIndex < entryCollection.size(); rowIndex++) {
             DynamicObject entry = entryCollection.get(rowIndex);
-            int installmentYears = entry.getInt(MasConstant.NCKD_INSTALLMENTYEARS);
-            initOperateOption(installmentYears, rowIndex);
+            if(entry.get(MasConstant.NCKD_INSTALLMENTYEARS) != null) {
+                int installmentYears = entry.getInt(MasConstant.NCKD_INSTALLMENTYEARS);
+                initOperateOption(installmentYears, rowIndex);
+            }
         }
     }
 

+ 8 - 4
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/structappr/EntleaderAnlSalStdFormPlugin.java

@@ -40,8 +40,10 @@ public class EntleaderAnlSalStdFormPlugin extends AbstractStructApprFormPlugin i
         for (int rowIndex = 0; rowIndex < entryCollection.size(); rowIndex++) {
             DynamicObject entry = entryCollection.get(rowIndex);
             if(entry.get(MasConstant.NCKD_INSTALLMENTYEARS) != null) {
-                int installmentYears = entry.getInt(MasConstant.NCKD_INSTALLMENTYEARS);
-                initOperateOption(installmentYears, rowIndex);
+                if(entry.get(MasConstant.NCKD_INSTALLMENTYEARS) != null) {
+                    int installmentYears = entry.getInt(MasConstant.NCKD_INSTALLMENTYEARS);
+                    initOperateOption(installmentYears, rowIndex);
+                }
             }
         }
     }
@@ -192,8 +194,10 @@ public class EntleaderAnlSalStdFormPlugin extends AbstractStructApprFormPlugin i
 
             for (int rowIndex = 0; rowIndex < entryEntities.size(); rowIndex++) {
                 DynamicObject entry = entryEntities.get(rowIndex);
-                int installmentYears = entry.getInt(MasConstant.NCKD_INSTALLMENTYEARS);
-                initOperateOption(installmentYears,rowIndex);
+                if(entry.get(MasConstant.NCKD_INSTALLMENTYEARS) != null) {
+                    int installmentYears = entry.getInt(MasConstant.NCKD_INSTALLMENTYEARS);
+                    initOperateOption(installmentYears, rowIndex);
+                }
             }
 
         }

+ 8 - 4
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/structappr/SubcorpChiefSalStdFormPlugin.java

@@ -40,8 +40,10 @@ public class SubcorpChiefSalStdFormPlugin extends AbstractStructApprFormPlugin i
         DynamicObjectCollection entryCollection = this.getModel().getEntryEntity(FormConstant.NCKD_ENTRYENTITY);
         for (int rowIndex = 0; rowIndex < entryCollection.size(); rowIndex++) {
             DynamicObject entry = entryCollection.get(rowIndex);
-            int installmentYears = entry.getInt(MasConstant.NCKD_INSTALLMENTYEARS);
-            initOperateOption(installmentYears,rowIndex);
+            if(entry.get(MasConstant.NCKD_INSTALLMENTYEARS) != null) {
+                int installmentYears = entry.getInt(MasConstant.NCKD_INSTALLMENTYEARS);
+                initOperateOption(installmentYears, rowIndex);
+            }
         }
     }
 
@@ -172,8 +174,10 @@ public class SubcorpChiefSalStdFormPlugin extends AbstractStructApprFormPlugin i
             getView().updateView(FormConstant.NCKD_ENTRYENTITY);
             for (int rowIndex = 0; rowIndex < entryEntities.size(); rowIndex++) {
                 DynamicObject entry = entryEntities.get(rowIndex);
-                int installmentYears = entry.getInt(MasConstant.NCKD_INSTALLMENTYEARS);
-                initOperateOption(installmentYears,rowIndex);
+                if(entry.get(MasConstant.NCKD_INSTALLMENTYEARS) != null) {
+                    int installmentYears = entry.getInt(MasConstant.NCKD_INSTALLMENTYEARS);
+                    initOperateOption(installmentYears, rowIndex);
+                }
             }
 
         }

+ 4 - 2
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/structappr/change/AbstractSalaryStdChgFormPlugin.java

@@ -44,8 +44,10 @@ public abstract class AbstractSalaryStdChgFormPlugin extends AbstractFormPlugin
         DynamicObjectCollection entryCollection = this.getModel().getEntryEntity(FormConstant.NCKD_ENTRYENTITY);
         for (int rowIndex = 0; rowIndex < entryCollection.size(); rowIndex++) {
             DynamicObject entry = entryCollection.get(rowIndex);
-            int installmentYears = entry.getInt(MasConstant.NCKD_INSTALLMENTYEARS);
-            initOperateOption(installmentYears, rowIndex);
+            if(entry.get(MasConstant.NCKD_INSTALLMENTYEARS) != null) {
+                int installmentYears = entry.getInt(MasConstant.NCKD_INSTALLMENTYEARS);
+                initOperateOption(installmentYears, rowIndex);
+            }
         }
         markChange();
     }