| @@ -22,6 +22,7 @@ import com.iformall.service.WxMerchantService; | |||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.BeanUtils; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| @@ -191,9 +192,11 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { | |||||
| } | } | ||||
| List<WxMerchantBUser> list = this.findList(userQ); | List<WxMerchantBUser> list = this.findList(userQ); | ||||
| if(wxMallService.isgroupSupport(userQ)){ | if(wxMallService.isgroupSupport(userQ)){ | ||||
| userQ.setTenantId(null); | |||||
| userQ.setParentTenantId(userQ.getTenantId()); | |||||
| List<WxMerchantBUser> list1 = wxMerchantBUserMapper.findList(userQ); | |||||
| WxMerchantBUser userQ2 = new WxMerchantBUser(); | |||||
| BeanUtils.copyProperties(userQ2,userQ); | |||||
| userQ2.setTenantId(null); | |||||
| userQ2.setParentTenantId(userQ.getTenantId()); | |||||
| List<WxMerchantBUser> list1 = wxMerchantBUserMapper.findList(userQ2); | |||||
| if(list1.size() > 0){ | if(list1.size() > 0){ | ||||
| list.addAll(list1); | list.addAll(list1); | ||||
| } | } | ||||