Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java

@@ -49,6 +49,7 @@
import org.apache.poi.hssf.util.HSSFColor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -1387,19 +1388,32 @@
   @Override
   @Transactional(rollbackFor = Exception.class)
   public boolean updateUser(SmUserDTO smUserDTO) throws PLException {
      //判空
      VciBaseUtil.alertNotNull(
            smUserDTO,"修改的用户对象",
            smUserDTO.getOid(),"用户主键",
            smUserDTO.getId(),"用户名",
            smUserDTO.getPassword(),"密码",
            smUserDTO.getConfirmPassword(),"确认密码",
            smUserDTO.getName(),"姓名"
      );
      //校验
      check(smUserDTO,false,false);
      //查询数据库中的
      SmUserVO dbSmUserVO = getUserByUserOid(smUserDTO.getOid());
      SmUserVO dbSmUserVO;
      if(StringUtils.isBlank(smUserDTO.getId()) && StringUtils.isNotBlank(smUserDTO.getOid())
            && StringUtils.isNotBlank(smUserDTO.getName())){

         //查询数据库中的
         dbSmUserVO = getUserByUserOid(smUserDTO.getOid());
         dbSmUserVO.setName(smUserDTO.getName());
         dbSmUserVO.setEmail(smUserDTO.getEmail());
         BeanUtils.copyProperties(dbSmUserVO,smUserDTO);
         //校验
         check(smUserDTO,false,false);
      }else{
         //判空
         VciBaseUtil.alertNotNull(
               smUserDTO,"修改的用户对象",
               smUserDTO.getOid(),"用户主键",
               smUserDTO.getId(),"用户名",
               smUserDTO.getPassword(),"密码",
               smUserDTO.getConfirmPassword(),"确认密码",
               smUserDTO.getName(),"姓名"
         );
         //校验
         check(smUserDTO,false,false);
         //查询数据库中的
         dbSmUserVO = getUserByUserOid(smUserDTO.getOid());
      }
      //根据主键没查询到了用户
      if(Func.isEmpty(dbSmUserVO) || Func.isBlank(dbSmUserVO.getOid())){
         throw new PLException("500", new String[] { "当前修改的用户不存在"});