|
@@ -25,6 +25,7 @@ import io.swagger.annotations.ApiOperation;
|
|
|
import io.swagger.annotations.ApiParam;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
+import org.bouncycastle.jcajce.provider.symmetric.DES;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.BeansException;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -214,6 +215,9 @@ public class BrandController extends AbstractController{
|
|
|
}
|
|
|
// 生成直播间地址
|
|
|
String liveRoomUrl = jsonObject.getString("webSite").replaceAll("smobile.html", "shop.html");
|
|
|
+ if(getCompanyId() == null && jsonObject.get("companyId") !=null ){
|
|
|
+ brand.setCreateUserDeptId(jsonObject.getLong("companyId"));
|
|
|
+ }
|
|
|
brand.setLiveRoomUrl(liveRoomUrl);
|
|
|
|
|
|
brandService.save(brand,true);
|
|
@@ -264,6 +268,9 @@ public class BrandController extends AbstractController{
|
|
|
// 生成直播间地址
|
|
|
String liveRoomUrl = jsonObject.getString("webSite").replaceAll("smobile.html", "shop.html");
|
|
|
brand.setLiveRoomUrl(liveRoomUrl);
|
|
|
+ if(getCompanyId() == null && jsonObject.get("companyId") !=null ){
|
|
|
+ brand.setCreateUserDeptId(jsonObject.getLong("companyId"));
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
brand.setAppListPicUrl(brand.getAppListPicUrl());
|