Merge remote-tracking branch 'origin/release-201846-wangcz' into release-201846-wangcz

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

@@ -429,10 +429,7 @@ public class UserServiceImpl implements UserService {
 			user.setUserUU(addssoUser.getUserUU());
 			user.addEnterprise(SystemSession.getUser().getEnterprise());
 			user.setCurrentEnterprise();
-			List<User> exitUser = userDao.findUserByUserUU(addssoUser.getUserUU());
-			if (CollectionUtils.isEmpty(exitUser)) {
-				user = userDao.save(user);
-			}
+			//user = userDao.save(user);
 		} catch (Exception e) {
 			throw new RuntimeException(e.getMessage());
 		}

src/main/webapp/resources/js/sso/controllers/staffManagementCtrl.js

@@ -9,6 +9,7 @@ define(['app/app'], function (app) {
         document.title = '员工管理-帐户中心';
         $scope.tab = 'auth';
         $scope.addingUser = false;
+        $scope.userEmailSuccess = true;
         $scope.setAddingUser = function (status) {
             $scope.addingUser = status;
             $scope.adding = false;
@@ -248,7 +249,7 @@ define(['app/app'], function (app) {
                 toaster.pop('error', '请输入用户名信息');
                 return;
             }
-            if (!$scope.userEmailSuccess || !$scope.userTelSuccess) {
+            if (!$scope.userTelSuccess || !$scope.userEmailSuccess) {
                 toaster.pop('error', '请输入正确的信息后提交');
                 return;
             }
@@ -368,7 +369,6 @@ define(['app/app'], function (app) {
          */
         $scope.emailValid = function (email) {
             var reg = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/
-            console.log(email)
             if (email) {
                 reg.test(email) ? $scope.userEmailSuccess = true : $scope.userEmailSuccess = false;
             } else {