doomiwork 3.3.1 → 3.3.4
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.
- package/core/database/daoBase.js +41 -98
- package/package.json +1 -1
package/core/database/daoBase.js
CHANGED
|
@@ -216,21 +216,15 @@ class mysqlDao extends dao{
|
|
|
216
216
|
switch (element.allowtype){
|
|
217
217
|
case 1: ///部门
|
|
218
218
|
pObject.deptid.push(element.allowid)
|
|
219
|
-
|
|
220
|
-
pObject.depttext.push(element.allowname)
|
|
221
|
-
}
|
|
219
|
+
pObject.depttext.push(element.allowname)
|
|
222
220
|
break;
|
|
223
221
|
case 2: ///角色
|
|
224
222
|
pObject.roleid.push(element.allowid)
|
|
225
|
-
|
|
226
|
-
pObject.roletext.push(element.allowname)
|
|
227
|
-
}
|
|
223
|
+
pObject.roletext.push(element.allowname)
|
|
228
224
|
break;
|
|
229
225
|
case 4: ///用户
|
|
230
226
|
pObject.userid.push(element.allowid)
|
|
231
|
-
|
|
232
|
-
pObject.usernames.push(element.allowname)
|
|
233
|
-
}
|
|
227
|
+
pObject.usernames.push(element.allowname)
|
|
234
228
|
break;
|
|
235
229
|
}
|
|
236
230
|
}
|
|
@@ -243,7 +237,7 @@ class mysqlDao extends dao{
|
|
|
243
237
|
retValue.consumepermission.user = pObject.userid.join(',')
|
|
244
238
|
retValue.consumepermission.usertext = pObject.usernames.join(',');// + ((pObject.userid.length > pObject.usernames.length) ? `等${pObject.userid.length}个用户` : '');
|
|
245
239
|
|
|
246
|
-
console.log('retValue==>', retValue)
|
|
240
|
+
// console.log('retValue==>', retValue)
|
|
247
241
|
return retValue;
|
|
248
242
|
})
|
|
249
243
|
}
|
|
@@ -252,84 +246,7 @@ class mysqlDao extends dao{
|
|
|
252
246
|
if (!this.hasPermissionControl || !permissionParam) {
|
|
253
247
|
return Promise.resolve({successed:true})
|
|
254
248
|
};
|
|
255
|
-
|
|
256
|
-
// replace into vmv3_data_permission(
|
|
257
|
-
// data_type,
|
|
258
|
-
// data_id,
|
|
259
|
-
// permission_type,
|
|
260
|
-
// data_department,
|
|
261
|
-
// data_department_text,
|
|
262
|
-
// data_role,
|
|
263
|
-
// data_role_text,
|
|
264
|
-
// data_level,
|
|
265
|
-
// data_level_text,
|
|
266
|
-
// data_user,
|
|
267
|
-
// data_user_text
|
|
268
|
-
// ) values
|
|
269
|
-
// `
|
|
270
|
-
// let subItem = [];
|
|
271
|
-
// if (permissionParam.managepermission){
|
|
272
|
-
// const mItem = permissionParam.managepermission;
|
|
273
|
-
// subItem.push(`(
|
|
274
|
-
// ${this.tableoption.permissiondatatype},
|
|
275
|
-
// '${id}',
|
|
276
|
-
// 1,
|
|
277
|
-
// '${mItem.department || ''}',
|
|
278
|
-
// '${mItem.departmenttext || ''}',
|
|
279
|
-
// '${mItem.role || ''}',
|
|
280
|
-
// '${mItem.roletext || ''}',
|
|
281
|
-
// '${mItem.level || ''}',
|
|
282
|
-
// '${mItem.leveltext || ''}',
|
|
283
|
-
// '${mItem.user || ''}',
|
|
284
|
-
// '${mItem.usertext || ''}'
|
|
285
|
-
// )`)
|
|
286
|
-
|
|
287
|
-
// }
|
|
288
|
-
|
|
289
|
-
// if (permissionParam.consumepermission) {
|
|
290
|
-
// const mItem = permissionParam.consumepermission;
|
|
291
|
-
// subItem.push(`(
|
|
292
|
-
// ${this.tableoption.permissiondatatype},
|
|
293
|
-
// '${id}',
|
|
294
|
-
// 2,
|
|
295
|
-
// '${mItem.department || ''}',
|
|
296
|
-
// '${mItem.departmenttext || ''}',
|
|
297
|
-
// '${mItem.role || ''}',
|
|
298
|
-
// '${mItem.roletext || ''}',
|
|
299
|
-
// '${mItem.level || ''}',
|
|
300
|
-
// '${mItem.leveltext || ''}',
|
|
301
|
-
// '${mItem.user || ''}',
|
|
302
|
-
// '${mItem.usertext || ''}'
|
|
303
|
-
// )`)
|
|
304
|
-
// }
|
|
305
|
-
//return this.executeSql(sqlCommand+subItem.join(','));
|
|
306
|
-
|
|
307
|
-
const sqlCommand = `
|
|
308
|
-
delete from framework_permission where data_id=? and data_type=?;
|
|
309
|
-
insert into framework_permission(
|
|
310
|
-
data_id,
|
|
311
|
-
data_type,
|
|
312
|
-
allow_type,
|
|
313
|
-
allow_id
|
|
314
|
-
) values ?;
|
|
315
|
-
|
|
316
|
-
update framework_permission op
|
|
317
|
-
inner join vm_org_department od on op.allow_id=od.department_id
|
|
318
|
-
set op.allow_name = od.department_name,
|
|
319
|
-
op.allow_path = od.parent_path
|
|
320
|
-
where data_id=? and data_type=? and allow_type=1;
|
|
321
|
-
|
|
322
|
-
update framework_permission op
|
|
323
|
-
inner join vm_org_role od on op.allow_id=od.role_id
|
|
324
|
-
set op.allow_name = od.role_name
|
|
325
|
-
where data_id=? and data_type=? and allow_type=2;
|
|
326
|
-
|
|
327
|
-
update framework_permission op
|
|
328
|
-
inner join vm_org_user od on op.allow_id=od.user_id
|
|
329
|
-
set op.allow_name = od.user_name
|
|
330
|
-
where data_id=? and data_type=? and allow_type=4;
|
|
331
|
-
|
|
332
|
-
`
|
|
249
|
+
let sqlCommand = `delete from framework_permission where data_id=? and data_type=?;`
|
|
333
250
|
let subItem = [];
|
|
334
251
|
|
|
335
252
|
|
|
@@ -348,16 +265,42 @@ class mysqlDao extends dao{
|
|
|
348
265
|
subItem.push([id, this.tableoption.permissiondatatype, 4, uid])
|
|
349
266
|
}
|
|
350
267
|
}
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
268
|
+
let sqlParam = [id, this.tableoption.permissiondatatype];
|
|
269
|
+
if (subItem.length){
|
|
270
|
+
sqlCommand = sqlCommand+`
|
|
271
|
+
insert into framework_permission(
|
|
272
|
+
data_id,
|
|
273
|
+
data_type,
|
|
274
|
+
allow_type,
|
|
275
|
+
allow_id
|
|
276
|
+
) values ?;
|
|
277
|
+
|
|
278
|
+
update framework_permission op
|
|
279
|
+
inner join vm_org_department od on op.allow_id=od.department_id
|
|
280
|
+
set op.allow_name = od.department_name,
|
|
281
|
+
op.allow_path = od.parent_path
|
|
282
|
+
where data_id=? and data_type=? and allow_type=1;
|
|
283
|
+
|
|
284
|
+
update framework_permission op
|
|
285
|
+
inner join vm_org_role od on op.allow_id=od.role_id
|
|
286
|
+
set op.allow_name = od.role_name
|
|
287
|
+
where data_id=? and data_type=? and allow_type=2;
|
|
288
|
+
|
|
289
|
+
update framework_permission op
|
|
290
|
+
inner join vm_org_user od on op.allow_id=od.user_id
|
|
291
|
+
set op.allow_name = od.user_name
|
|
292
|
+
where data_id=? and data_type=? and allow_type=4;
|
|
293
|
+
`
|
|
294
|
+
sqlParam.push(
|
|
295
|
+
subItem,
|
|
296
|
+
id,
|
|
297
|
+
this.tableoption.permissiondatatype,
|
|
298
|
+
id,
|
|
299
|
+
this.tableoption.permissiondatatype,
|
|
300
|
+
id,
|
|
301
|
+
this.tableoption.permissiondatatype);
|
|
302
|
+
}
|
|
303
|
+
return this.executeSql(sqlCommand, sqlParam);
|
|
361
304
|
}
|
|
362
305
|
/**
|
|
363
306
|
*
|