Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTrave...

puzhibing

2024-02-07 e213999b5e987a3e988dabd639df215addf7b5fc

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java

@@ -24,10 +24,10 @@
     * @throws Exception
     */
    @Override
    public String queryByType(Integer type) throws Exception {
        String s = agreementMapper.queryByType(type, 2);
    public String queryByType(Integer type, Integer language) throws Exception {
        String s = agreementMapper.queryByType(language, type, 2);
        if(ToolUtil.isEmpty(s)){
            s = agreementMapper.queryByType(type, null);
            s = agreementMapper.queryByType(language, type, null);
        }
        return s;
    }