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

Administrator

2022-01-05 548c15acd182735a75fa8aa447e28645b6a36970

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

@@ -185,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) {
@@ -215,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) {