fix: remove parent_id default '0' from product_category model - Root nodes should have parent_id=NULL, not '0' - Tree query already checks 'parent_id IS NULL' - Revert direct edits to generated dspy files
This commit is contained in:
parent
f13651e830
commit
f05eea19e5
@ -21,8 +21,7 @@
|
|||||||
"name": "parent_id",
|
"name": "parent_id",
|
||||||
"title": "父类别ID",
|
"title": "父类别ID",
|
||||||
"type": "str",
|
"type": "str",
|
||||||
"length": 32,
|
"length": 32
|
||||||
"default": "0"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "name",
|
"name": "name",
|
||||||
|
|||||||
@ -2,12 +2,12 @@
|
|||||||
ns = params_kw.copy()
|
ns = params_kw.copy()
|
||||||
sql = '''select * from product_category where 1 = 1'''
|
sql = '''select * from product_category where 1 = 1'''
|
||||||
id = ns.get('id')
|
id = ns.get('id')
|
||||||
if id and id != '0' and id != 'null' and id != 'undefined':
|
if id:
|
||||||
sql += " and parent_id = ${id}$"
|
sql += " and parent_id = ${id}$"
|
||||||
else:
|
else:
|
||||||
sql += " and (parent_id is null or parent_id = '' or parent_id = '0')"
|
sql += " and parent_id is null"
|
||||||
|
|
||||||
sql += " order by sort_order, name "
|
sql += " order by name "
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
dbname = get_module_dbname('product_management')
|
dbname = get_module_dbname('product_management')
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
|
|||||||
@ -1,19 +1,15 @@
|
|||||||
|
|
||||||
ns = params_kw.copy()
|
ns = params_kw.copy()
|
||||||
for k,v in ns.items():
|
for k,v in ns.items():
|
||||||
if v == 'NaN' or v == 'null' or v == 'undefined' or v == '':
|
if v == 'NaN' or v == 'null':
|
||||||
ns[k] = None
|
ns[k] = None
|
||||||
|
id = params_kw.id
|
||||||
# Normalize parent_id: empty/0/None all mean root node (NULL)
|
if not id or len(id) > 32:
|
||||||
pid = ns.get('parent_id')
|
|
||||||
if not pid or pid == '0':
|
|
||||||
ns['parent_id'] = None
|
|
||||||
|
|
||||||
id = params_kw.get('id')
|
|
||||||
if not id or len(str(id)) > 32:
|
|
||||||
id = uuid()
|
id = uuid()
|
||||||
ns['id'] = id
|
ns['id'] = id
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
userorgid = await get_userorgid()
|
userorgid = await get_userorgid()
|
||||||
if not userorgid:
|
if not userorgid:
|
||||||
return {
|
return {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user