Merge branch 'dev' into feature-wangcz-201814

# Conflicts:
#	src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -366,7 +366,7 @@ public class SecurityController {
 			response.setHeader("P3P","CP=\"CURaADMa DEVa PSAo PSDo OUR BUS UNI PUR INT DEM STA PRE COM NAV OTC NOI DSPCOR\"");
 
 //			User user = getUserByToken(tk);
-			User mallUser = new User();
+			User mallUser = null;
 			if (userAccount.getMobile() != null) {
 				// UID表示所有系统公认的唯一标识，这里统一使用手机号
 				mallUser = userService.findUserByUserTelNoException(userAccount.getMobile());
@@ -375,10 +375,17 @@ public class SecurityController {
 				mallUser = userService.findUserByUserUUNoException(userAccount.getUserUU());
 			} else {
 				logger.error(String.format("invalid user %s, please set uid or dialectUID", userAccount.getVipName()));
+				return "successCallback({success:'0'})";
+			}
+
+			// 没用用户
+			if (mallUser == null) {
+				UserView userView = AccountUtils.findByUserUU(userAccount.getUserUU());
+				mallUser = userAccountService.save(userView);
 			}
 
 			// 企业判断
-			Enterprise enterprise = new Enterprise();
+			Enterprise enterprise = null;
 			if (userAccount.getSpaceUU() != null) {
 				Enterprise oldEnterprise = enterpriseDao.findByUu(userAccount.getSpaceUU());
 				// 判断商城是否存在当前企业，若存在则设置当前企业即可，若不存在则需新建一个企业后进行设置
@@ -411,17 +418,12 @@ public class SecurityController {
 				} else {
 					enterprise = oldEnterprise;
 				}
-			}
-			// 没用用户
-			if (mallUser == null) {
-				UserView userView = AccountUtils.findByUserUU(userAccount.getUserUU());
-				mallUser = userAccountService.save(userView);
-			}
-			if (enterprise != null && !mallUser.getEnterprises().contains(enterprise)) {
-//				if (!mallUser.getUserUU().equals(enterprise.getEnAdminuu())) {
+				// 用户关联企业
+				if (!mallUser.getEnterprises().contains(enterprise)) {
 					mallUser.getEnterprises().add(enterprise);
-//				}
+				}
 			}
+
 			// 最后一次登录时间
 			Date lastLoginTime = userAccount.getLastLoginTime();
 			if (lastLoginTime != null) {

src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -238,15 +238,15 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
         }
         // 暂时在正式 过滤admin访问权限
         if (needPermission != null) {
-                if (!user.getEnterprise().getUu().toString().equals(enUU)) {
-                    throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
-                } else {
-                    if (user.getEnterprise().getUu().toString().equals(enUU)) {
-                        if (!"登录商城后台进行运维管理".equals(needPermission)) {
-                            throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
-                        }
+            if (!user.getEnterprise().getUu().toString().equals(enUU)) {
+                throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
+            } else {
+                if (user.getEnterprise().getUu().toString().equals(enUU)) {
+                    if (!"登录商城后台进行运维管理".equals(needPermission)) {
+                        throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
                     }
                 }
+            }
         }
     }
 

src/main/java/com/uas/platform/b2c/prod/product/component/modal/Component.java

@@ -87,7 +87,8 @@ public class Component implements Serializable {
 	/**
 	 * 规格信息
 	 */
-	@Column(name = "cmp_spec")
+//	@Column(name = "cmp_spec")
+	@Transient
 	private String spec;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/component/modal/ComponentInfo.java

@@ -207,7 +207,8 @@ public class ComponentInfo implements Serializable {
 	/**
 	 * 规格信息
 	 */
-	@Column(name = "cmp_spec")
+//	@Column(name = "cmp_spec")
+	@Transient
 	private String spec;
 
 	/**

src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -825,7 +825,7 @@
                             <div class="il-box-small il-box">
                                 <!--<div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>-->
                                 <!--<div title="{{seek.produceDate}}" class="item"><span>生产日期：</span>{{seek.produceDate || '-'}}</div>-->
-                                <div title="{{seek.needquantity}}" class="item">{{seek.needquantity || '-'}}</div>
+                                <div title="{{seek.needQty || seek.needquantity}}" class="item">{{seek.needQty || seek.needquantity || '-'}}</div>
                                 <!--<div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>-->
                             </div>
                         </div>