|
|
@@ -103,7 +103,10 @@ public class UserLogic {
|
|
|
// }
|
|
|
|
|
|
userZfireParamBean.setCompanyWechatId("");
|
|
|
- adminUser.getAdminCompanyWechat().setCompanyWechatId(null);
|
|
|
+ // 商户要使用查所有师傅
|
|
|
+ if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
|
|
|
+ adminUser.getAdminCompanyWechat().setCompanyWechatId(null);
|
|
|
+ }
|
|
|
FieldUtils.supplyParam(userZfireParamBean, UserVO.class, adminUser);
|
|
|
|
|
|
IPage<UserVO> userVOIPage = commonMapper.userList(new Page(userZfireParamBean.getPageNum(), userZfireParamBean.getPageSize()), userZfireParamBean, null, isOK);
|