增加用户新增和修改编号重复验证

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/EmployeeManagementServiceImpl.java

@@ -112,8 +112,9 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
		resultMap.put("field3", response.getData().getField3()); // 审核意见
		resultMap.put("field4", response.getData().getField4()); // 公司
		resultMap.put("pictureUrl",uploadFileService.getFileUrl(response.getData().getField1(), minioConfig.getBucketHeaderImage()));
		
		resultMap.put("pictureUrl",
				uploadFileService.getFileUrl(response.getData().getField1(), minioConfig.getBucketHeaderImage()));
		String employeePosition = response.getData().getMainJobPosition();
		resultMap.put("employeePosition", employeePosition);
@@ -128,8 +129,46 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
		return CommonResponse.ok(resultMap);
	}
	/**
	 * 是否存在用户编码
	 * @param code
	 * @param id
	 * @return 
	 * @return true:存在，false:不存在
	 */
	private boolean isExistEmployeeCode(String code, String id) {
		if (StringUtils.isBlank(code)) {
			return false;
		}
		UserDto userDto = new UserDto();
		userDto.setCode(code);
		CommonRequest<UserDto> request = new CommonRequest<UserDto>(userDto);
		CommonResponse<List<Map<String, Object>>> response = userDtoQuery.queryWorkEmployeeByUserCode(request);
		boolean result = false;
		if (!CollectionUtils.isEmpty(response.getData())) {
			if (StringUtils.isNotBlank(id)) {
				for (Map<String, Object> map : response.getData()) {
					if (code.equals(String.valueOf(map.get("code"))) && !id.equals(String.valueOf(map.get("id")))) {
						result = true;
						break;
					}
				}
			} else {
				result = true;
			}
		}
		return result;
	}
	@Override
	public CommonResponse<Void> createEmployee(EmployeeDto employeeDto) throws Exception {
		if (isExistEmployeeCode(employeeDto.getCode(), null)) {
			return CommonResponse.fail("501", "编号已存在");
		}
		employeeDto.setField2(EbcConstant.AUDIT_STATUS_INI);
		CommonRequest<EmployeeDto> request = new CommonRequest<EmployeeDto>(employeeDto);
		return employeeService.createWorkEmployee(request);
@@ -137,6 +176,10 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
	@Override
	public CommonResponse<Void> modifyEmployee(EmployeeDto employeeDto) {
		if (isExistEmployeeCode(employeeDto.getCode(), String.valueOf(employeeDto.getId()))) {
			return CommonResponse.fail("501", "编号已存在");
		}
		employeeDto.setField2(EbcConstant.AUDIT_STATUS_INI);
		CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
		return employeeService.modifyEmployee(request);