Merge branch 'dev-mysql' into feature_release-tomysql

src/main/java/com/uas/platform/b2c/trade/vendor/service/impl/VendorIntroductionServiceImpl.java

@@ -40,7 +40,7 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
             keyword = keyword.trim();
         }
         Long enUU = 0L;
-        if (null != SystemSession.getUser()) {
+        if (null != SystemSession.getUser() && null != SystemSession.getUser().getEnterprise()) {
             enUU = SystemSession.getUser().getEnterprise().getUu();
         }
 		// 查询所有物料个数