Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSyst...

郑永安

2023-07-24 0645153dfa233b51a749db73f9bd5a8c5127c595

 src/main/java/com/gk/hotwork/Mapper/DepartmentInfoMapper.java

@@ -13,7 +13,7 @@
@Repository
public interface DepartmentInfoMapper extends BaseMapper<DepartmentInfo> {

    List<DepartmentVo> selectDataGrid(Page<DepartmentVo> page, Map<String, Object> condition);
    List<DepartmentVo> selectDataGrid(@Param("page") Page<DepartmentVo> page,@Param("condition") Map<String, Object> condition);

    DepartmentInfo selectExistByName(@Param("id") Long id,@Param("department") String department);

@@ -21,9 +21,9 @@

    DepartmentInfo selectSafety(@Param("id") Long id);

    Integer selectCountForExam(Map<String, Object> params);
    Integer selectCountForExam(@Param("params") Map<String, Object> params);

    List<DepartmentInfo> selectPageForExam(Map<String, Object> params);
    List<DepartmentInfo> selectPageForExam(@Param("params") Map<String, Object> params);

    DepartmentInfo getInfoByName(String departmentName);