sunsail-platform-admin.git

			@@ -98,6 +98,7 @@
			//设置部门
			// List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
			List<EmpBaseInfo> list = iPage.getRecords();
			List<EmpBaseInfo> newList = new ArrayList<>();
			List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
			list.forEach(p -> {
			p.setSexName("1".equals(p.getSex()) ? "男" : "女");
			@@ -159,6 +160,21 @@
			.orElse(""));
			p.setCertificateListName(getCertificateListName(p.getCertificateList(),dicItems));
			});
			// if (StringUtils.isNotBlank(empBaseInfo.getCertificateList())) {
			// String[] certificates = empBaseInfo.getCertificateList().split(",");
			// list.forEach(k -> {
			// String[] dbCertificates = k.getCertificateList().split(",");
			// for (String certificate : certificates) {
			// if (Arrays.asList(dbCertificates).contains(certificate)) {
			// newList.add(k);
			// break;
			// }
			// }
			// });
			// iPage.setRecords(newList);
			// } else {
			// iPage.setRecords(list);
			// }
			iPage.setRecords(list);
			return iPage;
			}
			@@ -1152,7 +1168,7 @@
			public void accept(QueryWrapper<EmpBaseInfo> wrapper) {
			for (int i = 0; i < certificates.length; i++) {
			String ageBtn = certificates[i];
			wrapper.or().like("a.certificateList", ageBtn);
			wrapper.or().gt("LOCATE('"+ageBtn+"',certificateList)",0);
			}
			}
			};

	febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java	补丁 \| 查看 \| 原始文档 \| blame \| 历史