作业取消优化

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationServiceImpl.java

@@ -2168,7 +2168,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 apsProcessOperationDo.setCancelroll(apsProcessOperationDo.getCancelroll() + curcancelroll);
             } else if (cancelProcessOperationVo.getCancelreason().equals("2")) {//输入取消
                 apsProcessOperationDo.setInputunqualifiedroll(apsProcessOperationDo.getInputunqualifiedroll() + curcancelroll);
-                Integer cancelrollall = (operationequcancelrollall.get(apsProcessOperationDo.getId()) == null ? 0 : operationequcancelrollall.get(apsProcessOperationDo.getId()));
+                Integer cancelrollall = ((operationequcancelrollall == null || operationequcancelrollall.get(apsProcessOperationDo.getId()) == null) ? 0 : operationequcancelrollall.get(apsProcessOperationDo.getId()));
                 curcancelroll = curcancelroll - apsProcessOperationDo.getCancelroll() - cancelrollall;
                 apsProcessOperationDo.setCancelroll(cancelrollall);
             } else if (cancelProcessOperationVo.getCancelreason().equals("3")) {//输入不合格