分销员添加报错
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
package com.czg.controller.admin;
|
package com.czg.controller.admin;
|
||||||
|
|
||||||
|
import com.czg.annotation.Debounce;
|
||||||
import com.czg.annotation.SaAdminCheckPermission;
|
import com.czg.annotation.SaAdminCheckPermission;
|
||||||
import com.czg.log.annotation.OperationLog;
|
import com.czg.log.annotation.OperationLog;
|
||||||
import com.czg.market.dto.MkDistributionUserDTO;
|
import com.czg.market.dto.MkDistributionUserDTO;
|
||||||
@@ -57,6 +58,7 @@ public class DistributionUserController {
|
|||||||
*
|
*
|
||||||
* @return 是否成功
|
* @return 是否成功
|
||||||
*/
|
*/
|
||||||
|
@Debounce
|
||||||
@PostMapping
|
@PostMapping
|
||||||
@OperationLog("分销员-添加")
|
@OperationLog("分销员-添加")
|
||||||
@SaAdminCheckPermission(parentName = "分销相关",value = "distribution:user:add", name = "分销员添加")
|
@SaAdminCheckPermission(parentName = "分销相关",value = "distribution:user:add", name = "分销员添加")
|
||||||
|
|||||||
@@ -467,8 +467,10 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
|
|||||||
.map(MkDistributionUserDTO::getId)
|
.map(MkDistributionUserDTO::getId)
|
||||||
.filter(Objects::nonNull)
|
.filter(Objects::nonNull)
|
||||||
.collect(Collectors.toSet());
|
.collect(Collectors.toSet());
|
||||||
shopUserMap = shopUserService.list(QueryWrapper.create().in(ShopUser::getId, shopUserIds))
|
List<ShopUser> shopUserList = shopUserService.list(QueryWrapper.create().in(ShopUser::getId, shopUserIds));
|
||||||
.stream().collect(Collectors.toMap(ShopUser::getId, shopUser -> shopUser));
|
if (CollUtil.isNotEmpty(shopUserList)) {
|
||||||
|
shopUserMap = shopUserList.stream().collect(Collectors.toMap(ShopUser::getId, shopUser -> shopUser));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
for (MkDistributionUserDTO record : page.getRecords()) {
|
for (MkDistributionUserDTO record : page.getRecords()) {
|
||||||
ShopUser shopUser = shopUserMap.get(record.getId());
|
ShopUser shopUser = shopUserMap.get(record.getId());
|
||||||
|
|||||||
Reference in New Issue
Block a user