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.starter.web.annotation.controller.VciUnCheckRight;
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;
@@ -12,7 +12,6 @@
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.util.Func;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -205,9 +204,15 @@
     * @param confirmPassword 确认密码
     */
    @RequestMapping(value = "/changePassword",method = RequestMethod.POST)
    public BaseResult changePassword(String userOid, String password, String confirmPassword) {
        userQueryService.changePassword(userOid, password, confirmPassword);
        return BaseResult.success("修改密码成功");
    public BaseResult changePassword(String userOid,String oldPassword, String password, String confirmPassword) throws PLException {
        try {
            return userQueryService.changePassword(userOid, oldPassword, password, confirmPassword) ? BaseResult.success("用户修改成功！"):BaseResult.fail("用户修改失败！");
        }catch (Exception e){
            e.printStackTrace();
            String exceptionMessage = "修改密码时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
    }

    /**
@@ -225,7 +230,7 @@
            e.printStackTrace();
            String exceptionMessage = "用户管理列表查询时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(e.getMessage());
            return BaseResult.fail(exceptionMessage);
        }
    }

@@ -254,7 +259,7 @@
    @RequestMapping(value = "/updateUser",method = RequestMethod.PUT)
    public BaseResult updateUser(@RequestBody SmUserDTO smUserDTO){
        try {
            return BaseResult.success(userQueryService.updateUser(smUserDTO) ? "用户修改成功！":"用户修改失败！");
            return userQueryService.updateUser(smUserDTO) ? BaseResult.success("用户修改成功！"):BaseResult.fail("用户修改失败！");
        }catch (Exception e){
            e.printStackTrace();
            String exceptionMessage = "修改用户时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);