Merge branch 'dev'

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/exception/YunShangException.java

@@ -7,6 +7,6 @@ package org.dromara.common.ys.exception;
 public class YunShangException extends RuntimeException {
 
     public YunShangException(String message) {
-        super("差旅资源调用失败！");
+        super("差旅资源调用失败！" + message);
     }
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/dubbo/RemoteYsOrderServiceImpl.java

@@ -189,10 +189,10 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
     @Override
     public void payed(String orderType, String orderNo) {
         log.info("支付成功后确认出票,orderType:{},orderNo:{}", orderType, orderNo);
-        pay(orderType, orderNo, true);
+        pay(orderType, orderNo);
     }
 
-    private void pay(String orderType, String orderNo, Boolean isPerson) {
+    private void pay(String orderType, String orderNo) {
         if (StringUtils.equals(orderType, OrderType.AIRPORT.getType())) {
             //飞机票
             Optional.ofNullable(orderAirportService.getOne(new OrderAirportBo().setOrderNo(orderNo))).ifPresent(vo -> {
@@ -202,13 +202,11 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
                 } catch (Exception e) {
                     log.error("飞机票支付失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
                 }
-                if (isPerson) {
-                    try {
-                        //确认出票
-                        airportService.confirmOrder(vo.getPersonCode(), new OrderConfirmModel().setOrderNo(orderNo).setAutoDraw(1));
-                    } catch (Exception e) {
-                        log.error("飞机票确认出票失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
-                    }
+                try {
+                    //确认出票
+                    airportService.confirmOrder(vo.getPersonCode(), new OrderConfirmModel().setOrderNo(orderNo).setAutoDraw(1));
+                } catch (Exception e) {
+                    log.error("飞机票确认出票失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
                 }
                 orderAirportService.updateOrderInfo(List.of(orderNo));
             });
@@ -221,13 +219,11 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
                 } catch (Exception e) {
                     log.error("火车票支付失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
                 }
-                if (isPerson) {
-                    try {
-                        //确认出票
-                        trainService.confirmOrder(vo.getPersonCode(), new ConfirmOrderModel().setOrderNo(orderNo));
-                    } catch (Exception e) {
-                        log.error("火车票确认出票失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
-                    }
+                try {
+                    //确认出票
+                    trainService.confirmOrder(vo.getPersonCode(), new ConfirmOrderModel().setOrderNo(orderNo));
+                } catch (Exception e) {
+                    log.error("火车票确认出票失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
                 }
                 orderTrainService.updateOrderInfo(List.of(orderNo));
             });
@@ -236,13 +232,11 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
         } else if (StringUtils.equals(orderType, OrderType.HOTEL.getType())) {
             //酒店
             Optional.ofNullable(orderHotelService.getOne(new OrderHotelBo().setOrderNo(orderNo))).ifPresent(vo -> {
-                if (isPerson) {
-                    try {
-                        //确认出票
-                        hotelService.orderPay(vo.getPersonCode(), new PayOrderModel().setOrderNo(orderNo));
-                    } catch (Exception e) {
-                        log.error("酒店确认出票失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
-                    }
+                try {
+                    //确认出票
+                    hotelService.orderPay(vo.getPersonCode(), new PayOrderModel().setOrderNo(orderNo));
+                } catch (Exception e) {
+                    log.error("酒店确认出票失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
                 }
                 orderHotelService.updateOrderInfo(List.of(orderNo));
             });
@@ -252,7 +246,7 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
     @Override
     public void orderApprove(RemoteOrderApprove orderApprove) {
         log.info("审批同意后，订单修改：{}", orderApprove);
-        pay(orderApprove.getOrderType(), orderApprove.getOrderNo(), false);
+        pay(orderApprove.getOrderType(), orderApprove.getOrderNo());
         orderInvoicingService.save(
             new OrderInvoicingBo()
                 .setType(orderApprove.getOrderType())

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java

@@ -210,6 +210,7 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:query")
     @GetMapping(value = {"/", "/{userId}"})
     public R<SysUserInfoVo> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
+        userId = userId == null ? LoginHelper.getUserId() : userId;
         SysUserBo sysUserBo = userService.selectById(userId);
         if (StringUtils.equals(sysUserBo.getUserType(), UserType.SYS_USER.getUserType())) {
             userService.checkUserDataScope(userId);

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/listener/DeptFileApproveGroupListener.java

 package org.dromara.workflow.flowable.listener;
 
 
+import cn.hutool.core.collection.CollectionUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.workflow.common.constant.FlowConstant;
 import org.dromara.workflow.domain.FileApprove;
 import org.dromara.workflow.mapper.FileApproveMapper;
@@ -34,9 +36,11 @@ public class DeptFileApproveGroupListener implements TaskListener {
 
         // 调用服务获取审批人列表
         List<Long> userIds = deptService.selectUserListByFileIdAndRoleKey(fa.getSysDeptFileId(), "file_approve");
-
+        if (CollectionUtil.isEmpty(userIds)) {
+            userIds = List.of(-1L);
+        }
         // 设置候选用户
-        delegateTask.setVariable("group", userIds);
+        delegateTask.addCandidateUsers(StreamUtils.toList(userIds, Object::toString));
     }
 
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/listener/DeptReviewCompleteListener.java

+package org.dromara.workflow.flowable.listener;
+
+import org.flowable.task.service.delegate.DelegateTask;
+import org.flowable.task.service.delegate.TaskListener;
+
+/**
+ * @author wenhe
+ */
+public class DeptReviewCompleteListener implements TaskListener {
+    @Override
+    public void notify(DelegateTask task) {
+        task.setVariable("end", true);
+    }
+}