Merge branch 'master' of shikejing/guns-separation into master

guns-main/src/main/java/cn/stylefeng/guns/zjxl/service/ZjxlCompanyCaseService.java

@@ -63,29 +63,30 @@ public class ZjxlCompanyCaseService extends BaseService {
    public int updateCompanyCase(ZjxlCompanyCase cc){
        String sql = "update zjxl_company_case SET company_id = '"+cc.getCompanyId()+"'";
        if (StringUtils.isNotEmpty(cc.getCompanyName())){
            sql += " , set company_name = "+cc.getCompanyName()+" ";
            sql += " ,  company_name = '"+cc.getCompanyName()+"' ";
        }
        if (StringUtils.isNotEmpty(cc.getCompanyDescribe())){
            sql += " , set company_describe = "+cc.getCompanyDescribe()+" ";
            sql += " ,  company_describe = '"+cc.getCompanyDescribe()+"' ";
        }
        if (StringUtils.isNotEmpty(cc.getCompanyDefaultImg())){
            sql += " , set company_default_img = "+cc.getCompanyDefaultImg()+" ";
            sql += " ,  company_default_img = '"+cc.getCompanyDefaultImg()+"' ";
        }
        if (StringUtils.isNotEmpty(cc.getCompanyExchangeImg())){
            sql += " , set company_exchange_img = "+cc.getCompanyExchangeImg()+" ";
            sql += " ,  company_exchange_img = '"+cc.getCompanyExchangeImg()+"' ";
        }
        if (StringUtils.isNotEmpty(cc.getCompanyAssociatedCase())){
            sql += " , set company_associated_case = "+cc.getCompanyAssociatedCase()+" ";
            sql += " ,  company_associated_case = '"+cc.getCompanyAssociatedCase()+"' ";
        }
        if (StringUtils.isNotEmpty(cc.getCompanyJumpUrl())){
            sql += " , set company_jump_url = "+cc.getCompanyJumpUrl()+" ";
            sql += " ,  company_jump_url = '"+cc.getCompanyJumpUrl()+"' ";
        }
        if (cc.getCompanySort() != null){
            sql += " , set company_sort = "+cc.getCompanySort()+" ";
            sql += " ,  company_sort = "+cc.getCompanySort()+" ";
        }
        if (cc.getCompanyIsLine() != null){
            sql += " , set company_is_line = "+cc.getCompanyIsLine()+" ";
            sql += " ,  company_is_line = "+cc.getCompanyIsLine()+" ";
        }
        sql += " where company_id = '"+cc.getCompanyId()+"' ";
        int update = jdbcTemplate.update(sql);
        return update;
    }

guns-main/src/main/java/cn/stylefeng/guns/zjxl/service/ZjxlPartnerService.java

@@ -57,17 +57,18 @@ public class ZjxlPartnerService extends BaseService {
    public int updatePartenr(ZjxlPartner partner){
        String sql = "update zjxl_partner SET partner_id = '"+partner.getPartnerId()+"'";
        if (StringUtils.isNotEmpty(partner.getPartnerName())){
            sql += " , set partner_name = "+partner.getPartnerName()+" ";
            sql += " ,  partner_name = '"+partner.getPartnerName()+"' ";
        }
        if (StringUtils.isNotEmpty(partner.getPartnerImg())){
            sql += " , set partner_img = "+partner.getPartnerImg()+" ";
            sql += " ,  partner_img = '"+partner.getPartnerImg()+"' ";
        }
        if (partner.getPartnerSort() != null){
            sql += " , set partner_sort = "+partner.getPartnerSort()+" ";
            sql += " ,  partner_sort = "+partner.getPartnerSort()+" ";
        }
        if (partner.getPartnerIsLine() != null){
            sql += " , set partner_is_line = "+partner.getPartnerIsLine()+" ";
            sql += " ,  partner_is_line = "+partner.getPartnerIsLine()+" ";
        }
        sql += " where partner_id = '"+partner.getPartnerId()+"' ";
        int update = jdbcTemplate.update(sql);
        return update;
    }