Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserController.java

@@ -8,6 +8,7 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.service.ICacheService;
+import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.common.utils.LoginAESUtil;
 import com.mortals.xhx.module.param.service.ParamService;
@@ -87,9 +88,11 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
     @Override
     protected void saveBefore(UserEntity entity, Map<String, Object> model, Context context) throws AppException {
         String loginName = LoginAESUtil.decrypt(entity.getLoginName(),AES_KEY,AES_IV,LoginAESUtil.AES_CBC);
-        String loginPwd = LoginAESUtil.decrypt(entity.getLoginPwd(),AES_KEY,AES_IV,LoginAESUtil.AES_CBC);
         entity.setLoginName(loginName);
-        entity.setLoginPwd(loginPwd);
+        if(StringUtils.isNotEmpty(entity.getLoginPwd())) {
+            String loginPwd = LoginAESUtil.decrypt(entity.getLoginPwd(), AES_KEY, AES_IV, LoginAESUtil.AES_CBC);
+            entity.setLoginPwd(loginPwd);
+        }
     }
 
     @Override