Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java

@@ -1,10 +1,10 @@
package com.vci.frameworkcore.controller;

import com.vci.dto.SmUserDTO;
import com.vci.corba.common.PLException;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
import com.vci.frameworkcore.constant.FrameWorkLangCodeConstant;
import com.vci.frameworkcore.model.dto.SmUserDTO;
import com.vci.frameworkcore.pagemodel.SmUserVO;
import com.vci.constant.FrameWorkLangCodeConstant;
import com.vci.pagemodel.SmUserVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.util.ControllerUtil;
@@ -204,9 +204,15 @@
     * @param confirmPassword 确认密码
     */
    @RequestMapping(value = "/changePassword",method = RequestMethod.POST)
    public BaseResult changePassword(String userOid, String password, String confirmPassword) throws PLException {
        userQueryService.changePassword(userOid, password, confirmPassword);
        return BaseResult.success("修改密码成功");
    public BaseResult changePassword(String userOid,String oldPassword, String password, String confirmPassword) throws PLException {
        try {
            return BaseResult.success(userQueryService.changePassword(userOid, oldPassword, password, confirmPassword) ? "修改密码成功！":"修改密码失败！");
        }catch (Exception e){
            e.printStackTrace();
            String exceptionMessage = "修改密码时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
    }

    /**