diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcShiftsMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcShiftsMapper.java index 771d7a38..2726acff 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/DcShiftsMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/DcShiftsMapper.java @@ -70,9 +70,11 @@ public interface DcShiftsMapper HashMap contactNumber(String contactNumber); //路管驻点名称查询路管驻点id HashMap selectStationId(@Param("stationName") String stationName); + //查询人员与驻点的信息 + List> selectEmp(@Param("organizationId")Long organizationId,@Param("name") String name); //根据创建时间获取信息 public DcShifts selectDcShiftsByCreateTime(Long id); - + // /** * 查询值班 * diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcShiftsServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcShiftsServiceImpl.java index 117e969d..d82d34c8 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcShiftsServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcShiftsServiceImpl.java @@ -326,6 +326,11 @@ public class DcShiftsServiceImpl implements IDcShiftsService throw new ServiceException(msg); } Long stationId =(Long) stationIdMap.get("id"); + List> mapList = dcShiftsMapper.selectEmp(stationId, name);//查询人员配置中是否有此人员配置的对应机构信息 + if (mapList==null||mapList.size()==0){ + msg = "没有查询到" + name + "对应的"+organizationName+"驻点信息,请查看输入是否正确以及人员信息中是否配置正确"; + throw new ServiceException(msg); + } dcShifts.setStation(stationId);//驻点id Long id = (Long) map.get("id"); dcShifts.setEmployeesId(id); diff --git a/zc-business/src/main/resources/mapper/business/DcShiftsMapper.xml b/zc-business/src/main/resources/mapper/business/DcShiftsMapper.xml index fb141fa1..a18da1eb 100644 --- a/zc-business/src/main/resources/mapper/business/DcShiftsMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcShiftsMapper.xml @@ -109,6 +109,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +