lidongdong
2022-10-18 07f19aeaaba1acde55314ab40115cf66fc1b9ad0
修改导办人员空闲状态报错 bug
4个文件已修改
31 ■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/SysUserMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/TransactionEventMapper.xml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
@@ -77,13 +77,14 @@
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "name",required = false) String name)
                                          @RequestParam(value = "name",required = false) String name,
                                          @RequestParam(value = "classifyGrade",required = false) String classifyGrade)
    {
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<ClassifyAdministration> pageParam = new Page<>(pageNum,pageSize);
        List<ClassifyAdministration> list = iClassifyAdministrationService.selectConfigList(pageParam,pageSize,name,"");
        int num=iClassifyAdministrationService.countNum(name,"");
        List<ClassifyAdministration> list = iClassifyAdministrationService.selectConfigList(pageParam,pageSize,name,classifyGrade);
        int num=iClassifyAdministrationService.countNum(name,classifyGrade);
        return getDataTable(list,num);
    }
flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml
@@ -50,7 +50,9 @@
            <if test="departmentId!=null">
                and id in (
                select classify_id from  automessage_transaction_event where department_id=#{departmentId} UNION
                select parent_id from  automessage_classify_administration   where id in (select classify_id FROM  automessage_transaction_event where department_id=#{departmentId})   )
                select parent_id from  automessage_classify_administration
                where id in (select classify_id FROM automessage_transaction_event
                where department_id=#{departmentId}))
            </if>
        </where>
    </select>
@@ -104,9 +106,6 @@
        </where>
    </select>
    <select id="selectParent" resultType="string">
        select id from automessage_classify_administration
        <where>
@@ -124,8 +123,5 @@
            </if>
        </where>
    </select>
</mapper>
flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -265,7 +265,7 @@
            <if test="openid != null and openid != '' ">,openid=#{openid}</if>
            ,update_time=sysdate()
        </set>
        where id= #{id}
        where user_id= #{userId}
    </update>
    <delete id="deleteConfigById" parameterType="string">
flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -55,12 +55,12 @@
            id,
            department_id,
            concat(
            IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select city from automessage_organization_chart
                    where automessage_organization_chart.id=department_id)),''),
            IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select district from automessage_organization_chart
                    where automessage_organization_chart.id=department_id)),''),
            IFnull((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select village from automessage_organization_chart
            where automessage_organization_chart.id=department_id)),'')
                IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select city from automessage_organization_chart
                        where automessage_organization_chart.id=department_id)),''),
                IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select district from automessage_organization_chart
                        where automessage_organization_chart.id=department_id)),''),
                IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select village from automessage_organization_chart
                where automessage_organization_chart.id=department_id)),'')
            ) AS department_area,
            (select contact_number from automessage_organization_chart where automessage_organization_chart.id=department_id) as contactNumber,
            classify_id,