Browse Source

修改

master
dimengzhe 2 years ago
parent
commit
12e44af818
  1. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  2. 6
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

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

6
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) {

Loading…
Cancel
Save