Merge branch 'hotfix/login_logic' into 'master'

Hotfix/login logic login logic See merge request !104

Merge branch 'hotfix/login_logic' into 'master'
Hotfix/login logic login logic See merge request !104
shuaiguo
Commit 46dd2ed1cf0f308c066f8ec33ac57a1b27ace893 2 parents 8ab67e75 52f76f68
Showing 2 changed files with 2 additions and 2 deletions
package.json
server/middleware/proxy.js
--- a/package.json
View file @46dd2ed
+++ b/package.json
View file @46dd2ed
 {
   "name": "yoho-shop-manage",
-   "version": "1.0.43",
+   "version": "1.0.44",
   "description": "",
   "main": "app.js",
   "scripts": {
--- a/server/middleware/proxy.js
View file @46dd2ed
+++ b/server/middleware/proxy.js
View file @46dd2ed
@@ -51,7 +51,7 @@ module.exports = (req, res, next) => {
             shopsId: currentShop.shopsId,
             shopId: currentShop.shopsId,
             shop: currentShop.shopsId,
-             supplierId: currentShop.shopsBrands.length ? _.first(currentShop.shopsBrands).supplierId : 0,
+             supplierId: currentShop.shopsBrands.length ? (req.user.supplier_id ? req.user.supplier_id : _.first(currentShop.shopsBrands).supplierId) : 0,
             platform_id: config.platform,
             userId: req.user.uid
         };