forked from gzzfw/backEnd/gz-dyh

liyj
2024-09-09 9b540b646aa7171d3d3ba707457b86445dc71dc7
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
@@ -21,14 +21,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.DigestUtils;
import javax.annotation.PostConstruct;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -232,7 +230,7 @@
                    if (ObjectUtils.isEmpty(ctUser)){
                        return ReturnFailUtils.getRepInfo("账号或密码错误,请确认后重试!");
                    }
                    if (UserBaseConsts.USER_STATUS_2.equals(ctUser.getStatus()) || UserBaseConsts.USER_STATUS_3.equals(ctUser.getStatus())){
                    if (ctUser.getStatus() != UserBaseConsts.USER_STATUS_1){
                        return ReturnFailUtils.getRepInfo("账号或密码错误,请确认后重试!");
                    }
                    // 封装用户信息
@@ -289,7 +287,12 @@
     */
    public ReturnBO webChangeCipher(String userId, CtCipherDTO ctCipherDTO){
        try{
            CtAccount ctAccount = this.getByAccAndType(userId, UserBaseConsts.ACC_TYPE_1);
            CtUser loginUser = ctUserService.getById(userId);
            CtAccount ctAccount = this.getByAccAndType(loginUser.getAcc(), UserBaseConsts.ACC_TYPE_1);
//            QueryWrapper<CtAccount> ctAccountQueryWrapper = new QueryWrapper<>();
//            ctAccountQueryWrapper.eq("user_id", loginUser.getId()).
//                    eq("acc_type", UserBaseConsts.ACC_TYPE_1);
//            CtAccount ctAccount =mapper.selectOne(ctAccountQueryWrapper);
            if (ObjectUtils.isEmpty(ctAccount)){
                return ReturnFailUtils.getRepInfo("输入账号或密码不正确,请确认后重试!");
            }