Merge remote-tracking branch 'origin/master'

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);
             }

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 rb.success().setData(list);
-        return objectResultBean.setData(list);
     }
 
     public ResultBean<List<String>> shareSelectUser(ShareUserQuery shareUserQuery) {