Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-11-17 1de0a85c067ceb62413d0f458899dca41b8322d0

 flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java

@@ -14,7 +14,8 @@
     * 查询机构列表
     */
    public List<OrganizationChartEntity> selectConfigList(@Param("parentId") String parentId,
                                                          @Param("grade") String grade);
                                                          @Param("grade") String grade,
                                                          @Param("ids") List<String> ids);

    /**
     * 新增机构
@@ -50,13 +51,20 @@
    /**
     * 查询机构列表(分页)
     */
    List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName);
    List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state,
                                            @Param("organizationName") String organizationName,@Param("ids") List<String> ids);


    /**
     * 统计数量(部门应用)
     */
    int countList(String organizationName);
    int countList(@Param("organizationName") String organizationName,@Param("ids") List<String> ids);


    /**
     * 根据所属地区查找部门
     */
    List<OrganizationChartEntity> selectByCode(@Param("id")String id, @Param("areaCode") String areaCode);