@gingkoo/base-server 0.0.4-alpha.4 → 0.0.4-alpha.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -133,15 +133,15 @@ const dictService = {
|
|
|
133
133
|
getDictItems: async function (filter, pageInfo) {
|
|
134
134
|
let pageSize = pageInfo.pageSize;
|
|
135
135
|
let pageIndex = pageInfo.pageIndex;
|
|
136
|
-
let searchParam = {};
|
|
137
|
-
let pops = {};
|
|
138
136
|
for (let v in filter) {
|
|
139
|
-
if (v
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
137
|
+
if (v === 'DICT_ID') {
|
|
138
|
+
filter[v] = {
|
|
139
|
+
equal: true,
|
|
140
|
+
v: filter[v],
|
|
141
|
+
};
|
|
143
142
|
}
|
|
144
143
|
}
|
|
144
|
+
|
|
145
145
|
filter = filter || {};
|
|
146
146
|
filter.ORG_ID = global.orgid;
|
|
147
147
|
let sql = '';
|
|
@@ -149,10 +149,6 @@ const dictService = {
|
|
|
149
149
|
const dbResult = await queryBaseSqlBuilder(entity.BASE_DICT_ITEMS, filter);
|
|
150
150
|
sql += dbResult.sql;
|
|
151
151
|
params = dbResult.params;
|
|
152
|
-
if (Object.keys(searchParam).length > 0) {
|
|
153
|
-
const result = await queryParamsBuilder(searchParam, null, null, pops);
|
|
154
|
-
sql += ' and ' + result.sql;
|
|
155
|
-
}
|
|
156
152
|
sql += ' order by ISNULL(ORD_NO), ORD_NO';
|
|
157
153
|
let results = await pageQuery(sql, params, pageSize, pageIndex);
|
|
158
154
|
if (!results) {
|
package/backend/routers/dict.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gingkoo/base-server",
|
|
3
|
-
"version": "0.0.4-alpha.
|
|
3
|
+
"version": "0.0.4-alpha.5",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "app.js",
|
|
6
6
|
"scripts": {
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"author": "",
|
|
21
21
|
"license": "ISC",
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@gingkoo/node-tools": "1.1.0-alpha.
|
|
23
|
+
"@gingkoo/node-tools": "1.1.0-alpha.6",
|
|
24
24
|
"axios": "1.6.8",
|
|
25
25
|
"bcryptjs": "^2.4.3",
|
|
26
26
|
"chalk": "^4.1.2",
|