Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

# Conflicts:
#	src/main/webapp/resources/view/usercenter/forstore/pay_center.html

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/EnterpriseServiceImpl.java

@@ -51,9 +51,10 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         enterprise.setEnName(userSpaceDetail.getName());
         enterprise.setEnLogoUrl(userSpaceDetail.getBusinessCodeImage());
         enterprise.setUu(Long.valueOf(userSpace.getDialectUID()));
-        User adminUser = userDao.findUserByUserTel(userSpaceDetail.getAdminTel()).get(0);
         Enterprise newEn = enterpriseDao.save(enterprise);
-        if (null != adminUser){
+        List<User> users = userDao.findUserByUserTel(userSpaceDetail.getAdminTel());
+        if (!CollectionUtils.isEmpty(users)){
+            User adminUser = users.get(0);
             Set<Enterprise> enterprises = null;
             if (null == adminUser.getEnterprises()){
                 enterprises = new HashSet<Enterprise>();

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -10,6 +10,7 @@ import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Status;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -50,15 +51,18 @@ public class UserServiceImpl implements UserService {
             }
         }
 
+        boolean isMember = false;
         //将该成员添加至企业
         Set<Enterprise> ens = u.getEnterprises();
-        Iterator<Enterprise> it = ens.iterator();
-        boolean isMember = false;
-        while (it.hasNext()) {
-            if (it.next().getUu() == enterprise.getUu()) {
-                isMember = true;
+        if (!CollectionUtils.isEmpty(ens)){
+            Iterator<Enterprise> it = ens.iterator();
+            while (it.hasNext()) {
+                if (it.next().getUu().equals(enterprise.getUu())) {
+                    isMember = true;
+                }
             }
         }
+
         if (!isMember) {
             Set<Enterprise> enterprises = null;
             if (null == u.getEnterprises()) {

src/main/webapp/resources/view/usercenter/forstore/pay_center.html

@@ -405,7 +405,7 @@
 						<span>新增账户</span>
 					</div>
 				</div>
-				<table class="user-account-table table" ng-table="bankInfoTableParams" style="table-layout: fixed ;margin-bottom:40px;">
+				<table class="user-account-table table" ng-table="bankInfoTableParams" style="table-layout: fixed;margin-bottom:40px;">
 					<thead>
 						<th>开户银行</th>
 						<th >开户支行</th>

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

@@ -787,7 +787,7 @@
     </div>
 </div>
 <!--模态框-->
-<div class="view-box" ng-if="showAddFrame" name="myForm">
+<div class="view-box" ng-if="showAddFrame">
     <div class="box">
         <div class="add-count">
             <h2>新增账户信息</h2>