(*)权限配置相关接口修改

api/app/lib/controllers/auth/index.js

@@ -80,7 +80,43 @@ async function login(ctx, next) {
                 expired: moment().add(1, 'day'),
                 userInfo: JSON.stringify(emisLoginRes)
             });
-
+            const { adminHr, id } = emisLoginRes;
+            let codes = [];
+            //人资管理员-所有权限
+            if (adminHr.some(admin => admin.id == id)) {
+                const resource = await models.Resource.findAll({
+                    attributes: ['code'],
+                    order: [['id', 'asc']]
+                })
+                codes = resource.map(r => r.code);
+            } else {
+                const userResources = await models.RoleResource.findAll({
+                    attributes: ['id', 'resId'],
+                    include: [{
+                        required: true,
+                        model: models.Role,
+                        attributes: [],
+                        include: [{
+                            model: models.UserRole,
+                            attributes: [],
+                            where: { userId: id }
+                        }],
+                    }, {
+                        required: true,
+                        model: models.Resource,
+                        attributes: ['id', 'name', 'code'],
+                    }],
+                    order: [['id', 'asc']]
+                });
+                let rslt = [];
+                userResources && userResources.map(ur => {
+                    if (!rslt.some(r => r.id === ur.resId)) {
+                        rslt.push(ur.resource);
+                        codes.push(ur.resource.code);
+                    }
+                })
+            }
+            emisLoginRes.codes = codes;
             ctx.status = 200;
             ctx.body = emisLoginRes;
         }

api/app/lib/controllers/role/index.js

@@ -6,7 +6,7 @@ async function get(ctx) {
     try {
         const { models } = ctx.fs.dc;
         let roleList = await models.Role.findAndCountAll({
-         where: { delete: true },
+            where: { delete: false },
             order: [['id', 'desc']],
         });
         ctx.status = 200
@@ -24,10 +24,10 @@ async function add(ctx) {
         const { name } = ctx.request.body
 
         const role = await models.Role.findOne({
-         where: { name }
+            where: { name: name, delete: false }
         })
 
-      if (role && !role.delete) {
+        if (role) {
             throw '当前角色已存在'
         }
 
@@ -49,13 +49,20 @@ async function edit(ctx) {
         // const { pepUserId, provinces, cities, businessLines } = ctx.request.body
         const { id, name } = ctx.request.body
 
-      const role = await models.Role.findOne({
+        const oldRole = await models.Role.findOne({
             where: { id }
         })
 
-      if (!role) {
+        if (!oldRole) {
             throw '当前角色不存在'
         }
+
+        const role = await models.Role.findOne({
+            where: { name: name, id: { $not: id }, delete: false }
+        })
+        if (!role) {
+            throw '当前角色已存在'
+        }
         let storageData = { name }
         await models.Role.update(storageData, {
             where: { id }
@@ -71,16 +78,32 @@ async function edit(ctx) {
 }
 
 async function del(ctx) {
+    const transaction = await ctx.fs.dc.orm.transaction();
     try {
         const { models } = ctx.fs.dc;
         const { id } = ctx.query
 
-      await models.Role.update({
-         delete: false},
-         {where: {id }
+        await models.Role.update({ delete: true },
+            {
+                where: { id },
+                transaction
+            })
+        await models.RoleResource.destroy({
+            where: {
+                roleId: id
+            },
+            transaction
+        })
+        await models.UserRole.destroy({
+            where: {
+                roleId: id
+            },
+            transaction
         })
+        await transaction.commit();
         ctx.status = 204;
     } catch (error) {
+        await transaction.rollback();
         ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
         ctx.status = 400;
         ctx.body = {