|
@@ -433,7 +433,7 @@ public class GoodsLogic {
|
|
|
goodsBean.setUpdateTime(new Date());
|
|
|
goodsBean.setCreateTime(creatDate);
|
|
|
|
|
|
- if (StringUtil.isEmpty(goodsBean.getPutCompanyId())) {
|
|
|
+ if (!StringUtil.isEmpty(goodsBean.getPutCompanyId())) {
|
|
|
goodsBean.setPutCompanyId(goodsBean.getPutCompanyId());
|
|
|
String[] split = StringUtils.split(goodsBean.getPutCompanyId(), ",");
|
|
|
|
|
@@ -587,6 +587,19 @@ public class GoodsLogic {
|
|
|
goodsBean.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
|
|
|
goodsBean.setCompanyName(adminUser.getLoginCompanyName());
|
|
|
|
|
|
+ if (!StringUtil.isEmpty(goodsBean.getPutCompanyId())) {
|
|
|
+ goodsBean.setPutCompanyId(goodsBean.getPutCompanyId());
|
|
|
+ String[] split = StringUtils.split(goodsBean.getPutCompanyId(), ",");
|
|
|
+
|
|
|
+ String name ="";
|
|
|
+ for (String s : split) {
|
|
|
+ AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById(s);
|
|
|
+ name = name+adminCompanyWechat.getCompanyName()+",";
|
|
|
+ }
|
|
|
+
|
|
|
+ goodsBean.setPutCompanyName(name);
|
|
|
+ }
|
|
|
+
|
|
|
final AdminCompanyWechat companyWechat = adminCompanyWechatService.getById(adminUser.getLoginCompanyWechatId());
|
|
|
|
|
|
List<GoodsSpec> notRemoveList = new ArrayList<>();
|