From 12e44af81892778b9c1648696a38f792da3b9cf8 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Tue, 28 Feb 2023 10:36:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationService.java                   | 4 ++--
 .../com/yxt/anrui/portal/biz/sysuser/SysUserService.java    | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index bd84fdd8c0..3d43cc1a15 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -648,7 +648,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (listResultBean.getSuccess()) {
             for (CommonAppendixVo commonApp : listResultBean.getData()) {
                 FinCollectionConfirmationAppendixVo paymentVoucherAppendixVo = new FinCollectionConfirmationAppendixVo();
-                commonApp.setFilePath(commonApp.getFilePath());
+                commonApp.setFilePath(fileUploadComponent.getUrlPrefix()+commonApp.getFilePath());
                 BeanUtil.copyProperties(commonApp, paymentVoucherAppendixVo);
                 paymentVoucherAppendixs.add(paymentVoucherAppendixVo);
             }
@@ -662,7 +662,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (listResultBean.getSuccess()) {
             for (CommonAppendixVo commonApp : listResultBean.getData()) {
                 FinCollectionConfirmationAppendixVo remittanceConfirmationAppendixVo = new FinCollectionConfirmationAppendixVo();
-                commonApp.setFilePath(commonApp.getFilePath());
+                commonApp.setFilePath(fileUploadComponent.getUrlPrefix()+commonApp.getFilePath());
                 BeanUtil.copyProperties(commonApp, remittanceConfirmationAppendixVo);
                 remittanceConfirmationAppendixs.add(remittanceConfirmationAppendixVo);
             }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
index 6e686cc206..1064310099 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
@@ -1325,6 +1325,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
     }
 
     public ResultBean<List<SysUserVo>> getUserByRoles(UserByRolesAndOrgQuery userQuery) {
+        ResultBean<List<SysUserVo>> rb = ResultBean.fireFail();
         List<String> roleSids = userQuery.getRoleSids();
         String orgSidPath = userQuery.getOrgSidPath();
         List<SysUserVo> list=new ArrayList<>();
@@ -1338,10 +1339,11 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                 data.forEach( f->{
                     list.add(f);
                 });
+            }else{
+                log.error("角色获取人员--s:"+userByRole.getMsg());
             }
         }
-        ResultBean<List<SysUserVo>> objectResultBean = ResultBean.fireSuccess();
-        return objectResultBean.setData(list);
+        return rb.success().setData(list);
     }
 
     public ResultBean<List<String>> shareSelectUser(ShareUserQuery shareUserQuery) {