Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-project/src/main/java/org/springblade/project/service/impl/HandoverServiceImpl.java

@@ -122,8 +122,12 @@ public class HandoverServiceImpl extends ServiceImpl<HandoverMapper, Handover> i
 			}
 		} else {
 			Handover temp = baseMapper.selectById(handover.getId());
-			if (handover.getChargeStatus() == 1 && !temp.getHandingUser().equals(handover.getHandingUser())) {
-				sendMsg = true;
+			if (handover.getChargeStatus() == 1) {
+				if (ObjectUtil.isEmpty(temp.getHandingUser())) {
+					sendMsg = true;
+				} else if (!temp.getHandingUser().equals(handover.getHandingUser())) {
+					sendMsg = true;
+				}
 			}
 
 			handover.setUpdateUser(AuthUtil.getUserId());
@@ -216,7 +220,7 @@ public class HandoverServiceImpl extends ServiceImpl<HandoverMapper, Handover> i
 			editItemStatus(handover.getId(), 1);
 
 			// 获取审批级次
-			List<AuditPathsLevels> auditPathsLevels = checkClient.listLevelsByActId(11, "status");
+			List<AuditPathsLevels> auditPathsLevels = checkClient.listLevelsByActId(12, "status");
 			if (CollectionUtils.isEmpty(auditPathsLevels)) {
 				throw new SecurityException("开启审批失败：未查询到审批信息");
 			}