bug修复

linwe

2023-12-25 0fe215931911d1cb64131a234df8debad9257a57

bug修复

 src/main/java/org/springblade/common/config/SwaggerConfiguration.java

@@ -57,21 +57,21 @@
     */
    private final OpenApiExtensionResolver openApiExtensionResolver;

    @Bean
    public Docket authDocket() {
        return docket("授权模块", Collections.singletonList(AppConstant.BASE_PACKAGES + ".modules.auth"));
    }
//    @Bean
//    public Docket authDocket() {
//        return docket("授权模块", Collections.singletonList(AppConstant.BASE_PACKAGES + ".modules.auth"));
//    }

    @Bean
    public Docket sysDocket() {
        return docket("系统模块",
            Arrays.asList(AppConstant.BASE_PACKAGES + ".modules.system", AppConstant.BASE_PACKAGES + ".modules.resource"));
            Arrays.asList(AppConstant.BASE_PACKAGES));
    }

    @Bean
    public Docket flowDocket() {
        return docket("工作流模块", Collections.singletonList(AppConstant.BASE_PACKAGES + ".flow"));
    }
//    @Bean
//    public Docket flowDocket() {
//        return docket("工作流模块", Collections.singletonList(AppConstant.BASE_PACKAGES + ".flow"));
//    }

    private Docket docket(String groupName, List<String> basePackages) {
        return new Docket(DocumentationType.SWAGGER_2)

 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml

@@ -22,7 +22,7 @@

    <select id="selectTaskPage" resultMap="taskResultMap">
        SELECT
        jda.address_name,
        IFNULL(jda.address_name,jp.localtion)address_name ,
        jt.id,
        jt.name,
        jt.type,
@@ -36,13 +36,15 @@
        jt.tenant_id,
        jt.create_dept,
        jt.is_deleted,
        jt.house_code
        jt.house_code,
        jt.report_type
        FROM
        jczz_gridman jgm
        LEFT JOIN jczz_grid jg ON jgm.grid_id = jg.id
        LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
        LEFT JOIN jczz_task jt ON jgr.house_code = jt.house_code
        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
        LEFT JOIN jczz_place jp on jp.house_code=jgr.house_code
        WHERE
        jgm.user_id = #{task.userId}
        and jt.report_type in(2,3,4,5,6)