diff --git a/Layout/default/Contract/View.php b/Layout/default/Contract/View.php index 99eafa04d..b02979596 100644 --- a/Layout/default/Contract/View.php +++ b/Layout/default/Contract/View.php @@ -186,6 +186,9 @@ +
diff --git a/application/ContractconfigItem/ContractconfigItemModel.php b/application/ContractconfigItem/ContractconfigItemModel.php index 384d21588..3869f21e2 100644 --- a/application/ContractconfigItem/ContractconfigItemModel.php +++ b/application/ContractconfigItem/ContractconfigItemModel.php @@ -41,7 +41,7 @@ class ContractconfigItemModel { $db = FronkDB::singleton(); - $res = $db->select("ContractconfigItem", "*", "1=1 ORDER BY name, `create`"); + $res = $db->select("ContractconfigItem", "*", "1=1 ORDER BY `order`, name, `create`"); if($db->num_rows($res)) { while($data = $db->fetch_object($res)) { $items[] = new ContractconfigItem($data); @@ -55,7 +55,7 @@ class ContractconfigItemModel { $db = FronkDB::singleton(); $where = self::getSqlFilter($filter); - $res = $db->select("ContractconfigItem", "*", "$where LIMIT 1"); + $res = $db->select("ContractconfigItem", "*", "$where ORDER BY `order`,name LIMIT 1"); if($db->num_rows($res)) { $data = $db->fetch_object($res); $item = new ContractconfigItem($data); @@ -73,7 +73,7 @@ class ContractconfigItemModel { $db = FronkDB::singleton(); $where = self::getSqlFilter($filter); - $res = $db->select("ContractconfigItem", "*", "$where ORDER BY name"); + $res = $db->select("ContractconfigItem", "*", "$where ORDER BY `order`,name"); if($db->num_rows($res)) { while($data = $db->fetch_object($res)) { $items[] = new ContractconfigItem($data);