|
@@ -37,7 +37,6 @@ public class GoodsTagLogic {
|
|
|
List<String> companyWechatIds = adminUser.getAdminCompanyIds();
|
|
|
|
|
|
return goodsTagService.lambdaQuery()
|
|
|
- .in(CollectionUtils.isNotEmpty(companyWechatIds), GoodsTag::getCompanyWechatId, companyWechatIds)
|
|
|
.eq(type != null, GoodsTag::getType, type)
|
|
|
.page(new Page<>(pageNum, pageSize));
|
|
|
}
|
|
@@ -50,14 +49,10 @@ public class GoodsTagLogic {
|
|
|
*/
|
|
|
public void updateGoodsTag(HttpServletRequest request, String tags,Integer type) {
|
|
|
AdminUserCom adminUser = commonLogic.getAdminUser(request);
|
|
|
- String loginCompanyWechatId = adminUser.getLoginCompanyWechatId();
|
|
|
- if (StringUtils.isEmpty(loginCompanyWechatId)) {
|
|
|
- throw new RemoteServiceException("无编辑标签权限");
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
//清除旧标签
|
|
|
goodsTagService.lambdaUpdate()
|
|
|
- .eq(GoodsTag::getCompanyWechatId, loginCompanyWechatId)
|
|
|
.eq(GoodsTag::getType, type)
|
|
|
.remove();
|
|
|
|
|
@@ -71,8 +66,6 @@ public class GoodsTagLogic {
|
|
|
GoodsTag goodsTag = new GoodsTag();
|
|
|
goodsTag.setGoodsTagName(tagStr);
|
|
|
goodsTag.setCreateBy(adminUser.getAdminUserId());
|
|
|
- goodsTag.setCompanyWechatId(loginCompanyWechatId);
|
|
|
- goodsTag.setCompanyName(adminUser.getLoginCompanyName());
|
|
|
goodsTag.setType(type);
|
|
|
saveTagList.add(goodsTag);
|
|
|
}
|