变更派遣修改，保安员年龄计算修改

Administrator

2022-01-05 548c15acd182735a75fa8aa447e28645b6a36970

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

@@ -20,10 +20,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.zxing.WriterException;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.AgeUtil;
import org.springblade.common.constant.CommonConstant;
@@ -63,12 +61,9 @@
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -190,11 +185,11 @@
         List<UserVO> userVOS = baseMapper.selectUserPagesByAge(page, user);
         //机构名称拼接
         userVOS.forEach(userVO -> {
            if (null != userVO.getCardid() && userVO.getCardid() != "") {
               userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
            } else {
               userVO.setAge(null);
            }
//            if (null != userVO.getCardid() && userVO.getCardid() != "") {
//               userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
//            } else {
//               userVO.setAge(null);
//            }
            if (null!=userVO.getDeptId()) {
               List<String> list = baseMapper.getDeptName(userVO.getDeptId());
               if (list.size() > 1) {
@@ -220,11 +215,11 @@
         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);
            }
//            if (null != userVO.getCardid() && userVO.getCardid() != "") {
//               userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
//            } else {
//               userVO.setAge(null);
//            }
            if (null!=userVO.getDeptId()) {
               List<String> list = baseMapper.getDeptName(userVO.getDeptId());
               if (list.size() > 1) {