派遣记录，单位修改

Administrator

2021-08-27 f2767f4dfa4a17c0a89e584047db4e3d7d91666d

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -26,6 +26,7 @@
import org.springblade.common.cache.ParamCache;
import org.springblade.common.cache.SysCache;
import org.springblade.common.cache.UserCache;
import org.springblade.common.constant.AgeUtil;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.TenantConstant;
import org.springblade.common.enums.DictEnum;
@@ -139,7 +140,15 @@

   @Override
   public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user) {
      return page.setRecords(baseMapper.selectUserPages(page, user));
      List<UserVO> userVOS = baseMapper.selectUserPages(page, user);
      userVOS.forEach(userVO -> {
         if (null!=userVO.getCardid() && userVO.getCardid()!=""){
            userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
         }else {
            userVO.setAge(null);
         }
      });
      return page.setRecords(userVOS);
   }

   @Override
@@ -335,6 +344,8 @@
         }
         //设置部门id
         user.setDeptId(userDeptService.selectIn(user.getDeptId()));
         //设置账号
         user.setAccount(user.getCardid());
         //获取默认密码配置
         user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
         //新增
@@ -577,6 +588,8 @@
         }
         //设置部门id
         user.setDeptId(userDeptService.selectIn(user.getDeptId()));
         //设置账号
         user.setAccount(user.getCardid());
         //获取默认密码配置
         user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
         //新增
@@ -594,4 +607,15 @@
   public UserVO getUserInfoBySecurityNumber(String securityNumber) {
      return baseMapper.getUserInfoBySecurityNumber(securityNumber);
   }


   /**
    * 保安员信息
    * @param user
    * @return
    */
   @Override
   public UserVO getUserDetails(User user) {
      return baseMapper.getUserDetails(user);
   }
}