Commit eb7fc4a355879c87c3d2abe63d192672b3a495c2
Merge branch 'master_cj_zq' into master_sample_order
Showing
1 changed file
with
6 additions
and
2 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/ledger/FundCoordinationController.java
| @@ -20,6 +20,7 @@ import com.lframework.starter.web.inner.entity.SysDept; | @@ -20,6 +20,7 @@ import com.lframework.starter.web.inner.entity.SysDept; | ||
| 20 | import com.lframework.starter.web.inner.entity.SysUser; | 20 | import com.lframework.starter.web.inner.entity.SysUser; |
| 21 | import com.lframework.starter.web.inner.service.system.SysDataDicItemService; | 21 | import com.lframework.starter.web.inner.service.system.SysDataDicItemService; |
| 22 | import com.lframework.starter.web.inner.service.system.SysDeptService; | 22 | import com.lframework.starter.web.inner.service.system.SysDeptService; |
| 23 | +import com.lframework.starter.web.inner.service.system.SysUserDeptService; | ||
| 23 | import com.lframework.starter.web.inner.service.system.SysUserService; | 24 | import com.lframework.starter.web.inner.service.system.SysUserService; |
| 24 | import com.lframework.starter.web.inner.vo.system.user.QuerySysUserVo; | 25 | import com.lframework.starter.web.inner.vo.system.user.QuerySysUserVo; |
| 25 | import com.lframework.xingyun.basedata.entity.CustomerShort; | 26 | import com.lframework.xingyun.basedata.entity.CustomerShort; |
| @@ -111,6 +112,8 @@ public class FundCoordinationController extends DefaultBaseController { | @@ -111,6 +112,8 @@ public class FundCoordinationController extends DefaultBaseController { | ||
| 111 | private CustomerCreditService customerCreditService; | 112 | private CustomerCreditService customerCreditService; |
| 112 | @Resource | 113 | @Resource |
| 113 | private TransactorHandler transactorHandler; | 114 | private TransactorHandler transactorHandler; |
| 115 | + @Resource | ||
| 116 | + private SysUserDeptService sysUserDeptService; | ||
| 114 | 117 | ||
| 115 | /** | 118 | /** |
| 116 | * 查询列表 | 119 | * 查询列表 |
| @@ -200,8 +203,9 @@ public class FundCoordinationController extends DefaultBaseController { | @@ -200,8 +203,9 @@ public class FundCoordinationController extends DefaultBaseController { | ||
| 200 | if (dept != null) { | 203 | if (dept != null) { |
| 201 | QuerySysUserVo vo = new QuerySysUserVo(); | 204 | QuerySysUserVo vo = new QuerySysUserVo(); |
| 202 | vo.setDeptCode(dept.getCode()); | 205 | vo.setDeptCode(dept.getCode()); |
| 203 | - List<SysUser> datas = sysUserService.query(vo); | ||
| 204 | - if (!CollectionUtil.isEmpty(datas)) { | 206 | + List<String> userIds = sysUserDeptService.listAllUserByDeptId(dept.getId(), true); |
| 207 | + if (!CollectionUtil.isEmpty(userIds)) { | ||
| 208 | + List<SysUser> datas = sysUserService.listByUserId(userIds); | ||
| 205 | results = datas.stream().map(QuerySysUserBo::new).collect(Collectors.toList()); | 209 | results = datas.stream().map(QuerySysUserBo::new).collect(Collectors.toList()); |
| 206 | } | 210 | } |
| 207 | } | 211 | } |