用户保存修改

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

@@ -179,8 +179,9 @@ public class EnterpriseController {
 		} catch (Exception e) {
 			throw new IllegalArgumentException("账户中心异常！");
 		}
-		UserSpaceDetail userSpaceDetail = new UserSpaceDetail();
+		UserSpaceDetail userSpaceDetail = null ;
 		if (userSpaceView != null) {
+			userSpaceDetail = new UserSpaceDetail();
 			userSpaceDetail.setUu(userSpaceView.getSpaceUU());
 			userSpaceDetail.setName(userSpaceView.getSpaceName());
 			userSpaceDetail.setCorporation(userSpaceView.getCorporation());

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

@@ -64,14 +64,20 @@ public class UserServiceImpl implements UserService {
             u.setUserUU(userUU);
         }
         //是否有密保
-        if (user.isHasQuestion()) {
-            u.setHasQuestion(1);
-        } else {
-            u.setHasQuestion(0);
+        Boolean hasQuestion = user.getHasQuestion();
+        if (hasQuestion != null) {
+            if (hasQuestion) {
+                u.setHasQuestion(1);
+            } else {
+                u.setHasQuestion(0);
+            }
         }
-        //设置密码强度;
-        u.setPwdSecLevel( (short)user.getPasswordLevel());
 
+        //设置密码强度;
+        Integer passwordLevel = user.getPasswordLevel();
+        if (passwordLevel != null) {
+            u.setPwdSecLevel(passwordLevel.shortValue());
+        }
         //安全强度;
         String name = user.getVipName();
         if (!StringUtils.isEmpty(name)) {
@@ -89,21 +95,25 @@ public class UserServiceImpl implements UserService {
         if (!StringUtils.isEmpty(mobile)) {
             u.setUserTel(mobile);
         }
-        String mobileArea = user.getMobileArea();
-        Short mobileValidCode = user.getMobileValidCode();
+       /* String mobileArea = user.getMobileArea();
+        Short mobileValidCode = user.getMobileValidCode();*/
         String email = user.getEmail();
         if (!StringUtils.isEmpty(email)) {
             u.setUserEmail(email);
         }
         Short emailValidCode = user.getEmailValidCode();
-        u.setEmailValidCode((int) emailValidCode);
-        String realName = user.getRealName();
+        if (emailValidCode != null) {
+            u.setEmailValidCode((int) emailValidCode);
+
+        }
         String idCard = user.getIdCard();
         if (!StringUtils.isEmpty(idCard)) {
             u.setUserIdcode(idCard);
         }
         Short identityValidCode = user.getIdentityValidCode();
-        u.setIdEnable(identityValidCode);
+        if (identityValidCode != null) {
+            u.setIdEnable(identityValidCode);
+        }
         String imId = user.getImId();
         if (!StringUtils.isEmpty(imId)) {
             u.setUserIMId(Long.parseLong(imId.trim()));

src/main/webapp/resources/js/common/services.js

@@ -243,13 +243,13 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
             },
             redirectPassword: function() {
                 // 获取密码修改Url;
+                var newTab=window.open('about:blank');
                 $http.get(rootPath + '/mPassWord/page', {
                     params: {
                         returnUrl: window.location.href
                     }
                 }).success(function(data) {
                     if (data.content) {
-                        var newTab=window.open('about:blank');
                         newTab.location.href=data.content;
                     } else {
                         alert('系统错误');
@@ -259,6 +259,7 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
                 });
             },
             redirectPhone: function() {
+                var newTab=window.open('about:blank');
                 // 获取电话修改Url
                 $http.get(rootPath + '/mPhone/page', {
                     params: {
@@ -266,7 +267,6 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
                     }
                 }).success(function(data) {
                     if (data.content) {
-                        var newTab=window.open('about:blank');
                         newTab.location.href=data.content;
                     } else {
                         alert('系统错误');
@@ -277,13 +277,13 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
             },
             redirectEmail: function() {
                 // 获取邮箱修改url
+                var newTab=window.open('about:blank');
                 $http.get(rootPath + '/mEmail/page', {
                     params: {
                         returnUrl: window.location.href
                     }
                 }).success(function(data) {
                     if (data.content) {
-                        var newTab=window.open('about:blank');
                         newTab.location.href=data.content;
 
                     } else {
@@ -295,13 +295,13 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
             },
             redirectSecQuestion: function() {
                 // 获取密保问题修改的url
+                var newTab=window.open('about:blank');
                 $http.get(rootPath + '/mQuestion/page', {
                     params: {
                         returnUrl: window.location.href
                     }
                 }).success(function(data) {
                     if (data.content) {
-                        var newTab=window.open('about:blank');
                         newTab.location.href=data.content;
                     } else {
                         alert('系统错误');
@@ -312,13 +312,13 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
             },
             redirectRealNameAuth : function() {
                 // 获取实名认证url
+                var newTab=window.open('about:blank');
                 $http.get(rootPath + '/realNameAuth/page', {
                     params: {
                         returnUrl: window.location.href
                     }
                 }).success(function(data) {
                     if (data.content) {
-                        var newTab=window.open('about:blank');
                         newTab.location.href=data.content;
                     } else {
                         alert('系统错误');