Commit f5fdd66a by 徐高华

Merge branch 'master_xgh_待开发调整711' into 'master'

登录

See merge request !199
parents 4f6a0a55 aea8cfe1
...@@ -146,7 +146,7 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -146,7 +146,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
String dictValue = loginUserDict.getDictValue(); String dictValue = loginUserDict.getDictValue();
List<StaffDTO> staffDTOS = new ArrayList<>(); List<StaffDTO> staffDTOS = new ArrayList<>();
List<StaffDTO> phoneDtos = staffApiService.listByPhoneNumber(dictValue); List<StaffDTO> phoneDtos = staffApiService.listByPhoneNumber(dictValue);
List<StaffDTO> userDtos = staffApiService.listByWxUserId(dictValue,loginStaff.getWxEnterpriseId()); List<StaffDTO> userDtos = staffApiService.listByWxUserId(dictValue,loginUserDict.getDictName().split(":")[1]);
if (CollectionUtils.isNotEmpty(phoneDtos)) { if (CollectionUtils.isNotEmpty(phoneDtos)) {
staffDTOS.addAll(phoneDtos); staffDTOS.addAll(phoneDtos);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment