@gingkoo/base-server 0.4.18 → 0.4.20
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.
|
@@ -33,6 +33,13 @@ class MappingFactory {
|
|
|
33
33
|
let modulesMap = {
|
|
34
34
|
async USER_LIST() {
|
|
35
35
|
let res = await userService.getUsers();
|
|
36
|
+
if (!res) {
|
|
37
|
+
return {
|
|
38
|
+
dict: {},
|
|
39
|
+
list: [],
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
res.push({ USER_ID: '@system', USER_NAME: '系统' });
|
|
36
43
|
let arr = [];
|
|
37
44
|
let dict = res.reduce((mo, item) => {
|
|
38
45
|
if (item.USER_ID) {
|
|
@@ -294,7 +294,7 @@ const excelImport = async (filePath = '') => {
|
|
|
294
294
|
|
|
295
295
|
workbook.eachSheet((worksheet, sheetId) => {
|
|
296
296
|
let sheetInfo = {
|
|
297
|
-
sheetName: worksheet.name,
|
|
297
|
+
sheetName: (worksheet.name || '')?.trim?.(),
|
|
298
298
|
data: [], // stirng[][]
|
|
299
299
|
};
|
|
300
300
|
worksheet.eachRow((row, rowNumber) => {
|