1

pro-base/src/main/java/com/idea/oa/flow2/controller/FlowMainController.java

@@ -563,23 +563,27 @@ public class FlowMainController extends BaseController {
                 newflowMainPush.setStatus(0);
                 flowMainPushService.insert(newflowMainPush);
 
-
-                FlowMain flowMain = modelService.selectByPrimaryKey(flowMainPush.getFlowMainId());
-                // 进行审核操作后 就要处理待办 清除数据
-                String param = "id=" + flowMain.getId() + "&flowMainPushId=" + entity.getFlowMainPushId() + "&applyUser=" + flowMain.getApplyUser();
-                parkWaitHandleService.userHandle(HandleTypeEnum.FK, param, ShiroUtils.getUserId());
-
-                // 付款申请
-                if(flowMain.getFlowType().equals(ConstantFlowType.PAYMENT)){
-                    String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款流程审批");
-                    applyPaymentSettleService.pushOaAndHandle(newflowMainPush,flowMain,waitUrl);
-                }
-                // 入驻申请
-                if(flowMain.getFlowType().equals(ConstantFlowType.CHECK_IN)){
-                    String waitUrl = parkWaitHandleService.getUrl("流程审批", "入驻流程审批");
-                    applyCheckInService.pushOaAndHandle(newflowMainPush,flowMain,waitUrl);
+                try {
+                    FlowMain flowMain = modelService.selectByPrimaryKey(flowMainPush.getFlowMainId());
+                    // 进行审核操作后 就要处理待办 清除数据
+                    String param = "id=" + flowMain.getId() + "&flowMainPushId=" + entity.getFlowMainPushId() + "&applyUser=" + flowMain.getApplyUser();
+                    parkWaitHandleService.userHandle(HandleTypeEnum.FK, param, ShiroUtils.getUserId());
+
+                    // 付款申请
+                    if(flowMain.getFlowType().equals(ConstantFlowType.PAYMENT)){
+                        String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款流程审批");
+                        applyPaymentSettleService.pushOaAndHandle(newflowMainPush,flowMain,waitUrl);
+                    }
+                    // 入驻申请
+                    if(flowMain.getFlowType().equals(ConstantFlowType.CHECK_IN)){
+                        String waitUrl = parkWaitHandleService.getUrl("流程审批", "入驻流程审批");
+                        applyCheckInService.pushOaAndHandle(newflowMainPush,flowMain,waitUrl);
+                    }
+                }catch (Exception e){
+                    log.error("推送异常", e);
                 }
 
+
             }
 
 

pro-base/src/main/resources/mybatis/apply/ApplyCheckInExtendMapper.xml

@@ -48,7 +48,7 @@
     </select>
 
     <select id="selectMaxNum" resultType="java.lang.String">
-        SELECT MAX(flow_num) AS maxnum FROM apply_check_in
+        SELECT ifnull(MAX(flow_num),'') AS maxnum FROM apply_check_in
     </select>
 
 </mapper>