From 05709d6c78e27507192bc41cb10dcdf20dc98514 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 九月 2024 15:05:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
index 9150d38..b3b0653 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
@@ -27,6 +27,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 瀹℃壒妯$増淇℃伅琛⊿ervice瀹炵幇
@@ -99,7 +100,7 @@
                 param.setType(Constants.formatIntegerNum(param.getType()));
                 param.setAddrParam(Constants.formatIntegerNum(param.getAddrParam()));
                 param.setDriverParam(Constants.formatIntegerNum(param.getDriverParam()));
-                param.setApproveType(Constants.formatIntegerNum(param.getApproveType()));
+                param.setApproveType(Objects.isNull(param.getApproveType())?Constants.TWO:param.getApproveType());
                 level ++ ;
             }
             //鍏堟竻闄ゅ師鏉ユ墍鏈夌殑灏遍櫔閰嶇疆

--
Gitblit v1.9.3