|
|
@@ -155,7 +155,7 @@ func (r *QhjNodeAgreementConfig) buildSql() string {
|
|
|
" c.agreementcontent" +
|
|
|
" FROM QHJ_NODEAGREEMENTCONFIG t" +
|
|
|
" LEFT JOIN QHJ_AGREEMENTCONFIG c on t.agreementid=c.agreementid" +
|
|
|
- " WHERE 1 = 1"
|
|
|
+ " WHERE 1 = 1 and c.isvalid = 1"
|
|
|
sqlId.AndEx("t.configid", r.CONFIGID, r.CONFIGID > 0)
|
|
|
sqlId.AndEx("t.nodetype", r.NODETYPE, r.NODETYPE > 0)
|
|
|
sqlId.AndEx("t.goodsid", r.GOODSID, r.GOODSID > 0)
|
|
|
@@ -344,7 +344,7 @@ func (r *QhjUserNodeCfgAndStatus) buildSql() string {
|
|
|
" LEFT JOIN QHJ_AGREEMENTCONFIG c" +
|
|
|
" on t.agreementid = c.agreementid" +
|
|
|
" LEFT JOIN k on k.nodetype=t.nodetype and t.goodsid=k.goodsid and k.userid=%v" +
|
|
|
- " WHERE 1 = 1"
|
|
|
+ " WHERE 1 = 1 and c.isvalid = 1"
|
|
|
sqlId.FormatParam(r.USERID)
|
|
|
sqlId.AndEx("t.configid", r.CONFIGID, r.CONFIGID > 0)
|
|
|
sqlId.AndEx("t.goodsid", r.GOODSID, r.GOODSID > 0)
|