| | |
|---|
| | | @Override |
|---|
| | | public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user) { |
|---|
| | | List<UserVO> userVOS = baseMapper.selectUserPages(page, user); |
|---|
| | | //机构名称拼接 |
|---|
| | | userVOS.forEach(userVO -> { |
|---|
| | | if (null != userVO.getCardid() && userVO.getCardid() != "") { |
|---|
| | | userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid())); |
|---|
| | |
|---|
| | | * @param isCovered |
|---|
| | | */ |
|---|
| | | @Override |
|---|
| | | @Transactional(rollbackFor = Exception.class) |
|---|
| | | public void importSecurity(List<SecurityExcel> data, Boolean isCovered, String deptId) { |
|---|
| | | //将不能导入的保安员账号存起来 |
|---|
| | | List<String> errorList = new ArrayList<>(); |
|---|
| | |
|---|
| | | }else { |
|---|
| | | //匹配组织机构是否一致,如果不一致 |
|---|
| | | if(!user2.getDeptId().equals(user.getDeptId())){ |
|---|
| | | Dept dept = deptService.getById(user.getDeptId()); |
|---|
| | | Dept dept = deptService.getById(user2.getDeptId()); |
|---|
| | | System.out.println("dept = " + dept); |
|---|
| | | Dept dept1 = deptService.getById(user.getDeptId()); |
|---|
| | | System.out.println("dept1 = " + dept1); |
|---|
| | | //如果是南昌总公司分公司导入的 |
|---|
| | | if (dept.getParentId().equals(1432626178757275649L)){ |
|---|
| | | user2.setDeptId(dept.getId().toString()); |
|---|
| | | if (dept.getId().equals(1432626178757275649L) && dept1.getParentId().equals(1432626178757275649L)){ |
|---|
| | | user2.setDeptId(dept1.getId().toString()); |
|---|
| | | //判断是否持证 |
|---|
| | | if (null != userExcel.getHold() && userExcel.getHold() != "") { |
|---|
| | | if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) { |
|---|
