Merge branch 'master_cj_zq' into master_sample_order

@@ -20,6 +20,7 @@ import com.lframework.starter.web.inner.entity.SysDept;
 import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
+import com.lframework.starter.web.inner.service.system.SysUserDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.starter.web.inner.vo.system.user.QuerySysUserVo;
 import com.lframework.xingyun.basedata.entity.CustomerShort;
@@ -111,6 +112,8 @@ public class FundCoordinationController extends DefaultBaseController {
     private CustomerCreditService customerCreditService;
     @Resource
     private TransactorHandler transactorHandler;
+    @Resource
+    private SysUserDeptService sysUserDeptService;
 
     /**
      * 查询列表
@@ -200,8 +203,9 @@ public class FundCoordinationController extends DefaultBaseController {
         if (dept != null) {
             QuerySysUserVo vo = new QuerySysUserVo();
             vo.setDeptCode(dept.getCode());
-            List<SysUser> datas = sysUserService.query(vo);
-            if (!CollectionUtil.isEmpty(datas)) {
+            List<String> userIds = sysUserDeptService.listAllUserByDeptId(dept.getId(), true);
+            if (!CollectionUtil.isEmpty(userIds)) {
+                List<SysUser> datas = sysUserService.listByUserId(userIds);
                 results = datas.stream().map(QuerySysUserBo::new).collect(Collectors.toList());
             }
         }