Merge remote-tracking branch 'origin/master'

src/main/java/com/gree/mall/manager/logic/goods/GoodsLogic.java

@@ -448,7 +448,7 @@ public class GoodsLogic {
 
                 GoodsCompany goodsCompany = new GoodsCompany();
                 goodsCompany.setGoodsId(goodsBean.getGoodsId());
-                goodsCompany.setConpanyName(adminCompany.getAdminCompanyId());
+                goodsCompany.setConpanyName(adminCompany.getAdminCompanyName());
                 goodsCompany.setCompanyId(adminCompany.getAdminCompanyId());
 
                 goodsCompanies.add(goodsCompany);
@@ -605,11 +605,11 @@ public class GoodsLogic {
             String name ="";
             for (String s : split) {
                 AdminCompany adminCompany = adminCompanyService.getById(s);
-                name = name+adminCompany.getAdminCompanyId()+",";
+                name = name+adminCompany.getAdminCompanyName()+",";
 
                 GoodsCompany goodsCompany = new GoodsCompany();
                 goodsCompany.setGoodsId(goodsBean.getGoodsId());
-                goodsCompany.setConpanyName(adminCompany.getAdminCompanyId());
+                goodsCompany.setConpanyName(adminCompany.getAdminCompanyName());
                 goodsCompany.setCompanyId(adminCompany.getAdminCompanyId());
 
                 goodsCompanies.add(goodsCompany);

src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -95,6 +95,8 @@ public class UserLogic {
     UserServiceWaitService userServiceWaitService;
     @Autowired
     GoodsService goodsService;
+    @Autowired
+    AdminWebsitService adminWebsitService;
 
 
     /**
@@ -256,10 +258,15 @@ public class UserLogic {
                     StringUtils.isBlank(mobile)) {
                 throw new RemoteServiceException("请填写关键信息");
             }
+            AdminWebsit adminWebsit = adminWebsitService.getById(websitId);
+            if (adminWebsit == null)
+                throw new RemoteServiceException("未找到所属网点");
             userService.lambdaUpdate()
                     .set(User::getWorkUserId, workUserId)
                     .set(User::getWebsitId, websitId)
                     .set(User::getWebsitName, websitName)
+                    .set(User::getCompanyId, adminWebsit.getCompanyId())
+                    .set(User::getCompanyName, adminWebsit.getCompanyName())
                     .set(User::getWorkName, workName)
                     .set(User::getPosition, position)
                     .set(User::getWorkPhone, mobile)