|
@@ -388,42 +388,42 @@ func (c *ContractCommon) ListBySeal() {
|
|
|
pars := make([]interface{}, 0)
|
|
|
//如果不是合规,那么只能查看自己的合同
|
|
|
if c.AdminWx.RoleTypeCode != utils.ROLE_TYPE_CODE_COMPLIANCE {
|
|
|
- condition += ` AND seller_id = ? `
|
|
|
+ condition += ` AND a.seller_id = ? `
|
|
|
pars = append(pars, c.AdminWx.AdminId)
|
|
|
}
|
|
|
//合同类型、、更新时间、所选销售
|
|
|
//关键字:合同编号、客户名称,社会信用码
|
|
|
if contractType != "" {
|
|
|
- condition += ` AND contract_type = ? `
|
|
|
+ condition += ` AND a.contract_type = ? `
|
|
|
pars = append(pars, contractType)
|
|
|
}
|
|
|
//合同状态
|
|
|
if status != "" {
|
|
|
- condition += ` AND status = ? `
|
|
|
+ condition += ` AND a.status = ? `
|
|
|
pars = append(pars, status)
|
|
|
}
|
|
|
//产品类型
|
|
|
if productId > 0 {
|
|
|
- condition += ` AND product_id = ? `
|
|
|
+ condition += ` AND a.product_id = ? `
|
|
|
pars = append(pars, productId)
|
|
|
}
|
|
|
//所选销售
|
|
|
if sellerIds != "" {
|
|
|
- condition += ` AND seller_id IN (` + sellerIds + `) `
|
|
|
+ condition += ` AND a.seller_id IN (` + sellerIds + `) `
|
|
|
}
|
|
|
//更新开始时间
|
|
|
if modifyStartTime != "" {
|
|
|
- condition += ` AND modify_time >= ? `
|
|
|
+ condition += ` AND a.modify_time >= ? `
|
|
|
pars = append(pars, modifyStartTime)
|
|
|
}
|
|
|
//更新结束时间
|
|
|
if modifyEndTime != "" {
|
|
|
- condition += ` AND modify_time <= ? `
|
|
|
+ condition += ` AND a.modify_time <= ? `
|
|
|
pars = append(pars, modifyEndTime)
|
|
|
}
|
|
|
//关键字
|
|
|
if keyword != "" {
|
|
|
- condition += ` AND (contract_code LIKE '%` + keyword + `%' OR company_name LIKE '%` + keyword + `%' OR credit_code LIKE '%` + keyword + `%' ) `
|
|
|
+ condition += ` AND (a.contract_code LIKE '%` + keyword + `%' OR a.company_name LIKE '%` + keyword + `%' OR a.credit_code LIKE '%` + keyword + `%' ) `
|
|
|
}
|
|
|
//关键字(全等)
|
|
|
if keywordEq != "" {
|