Bladeren bron

考试试题选择人员过滤已删除的用户,试卷分类删除15189类型

wy 1 jaar geleden
bovenliggende
commit
c995a77b7a
2 gewijzigde bestanden met toevoegingen van 7 en 7 verwijderingen
  1. 1 1
      src/store/modules/ibps/modules/user.js
  2. 6 6
      src/views/platform/examination/constants.js

+ 1 - 1
src/store/modules/ibps/modules/user.js

@@ -165,7 +165,7 @@ export default {
          * 获取所有系统用户账号
          * 获取所有系统用户账号
          */
          */
         getUserList ({ state, dispatch }) {
         getUserList ({ state, dispatch }) {
-            const sql = `select users.id_ as userId, users.name_ as userName, users.status_ as status, users.gender_ as gender, (select ifnull(GROUP_CONCAT(DISTINCT roles.role_id_ SEPARATOR ','), '') from ibps_party_user_role as roles where roles.user_id_ = users.id_ ) as roleId, (select ifnull(GROUP_CONCAT(DISTINCT roles.name_ SEPARATOR ','), '') from ibps_party_role as roles where roles.id_ in (select role_id_ from ibps_party_user_role where user_id_ = users.id_)) as roleName, (select ifnull(GROUP_CONCAT(DISTINCT roles.role_alias_ SEPARATOR ','), '') from ibps_party_role as roles where roles.id_ in (select role_id_ from ibps_party_user_role where user_id_ = users.id_)) as roleAlias, ifnull(o.name_, '') as groupName from ibps_party_employee users left join ibps_party_user_role ur on users.id_ = ur.user_id_ left join ibps_party_role r on r.id_ = ur.role_id_ left join ibps_party_org o on o.id_ = users.group_id_ group by users.id_
+            const sql = `select users.id_ as userId, users.name_ as userName, users.status_ as status, users.gender_ as gender, (select ifnull(GROUP_CONCAT(DISTINCT roles.role_id_ SEPARATOR ','), '') from ibps_party_user_role as roles where roles.user_id_ = users.id_ ) as roleId, (select ifnull(GROUP_CONCAT(DISTINCT roles.name_ SEPARATOR ','), '') from ibps_party_role as roles where roles.id_ in (select role_id_ from ibps_party_user_role where user_id_ = users.id_)) as roleName, (select ifnull(GROUP_CONCAT(DISTINCT roles.role_alias_ SEPARATOR ','), '') from ibps_party_role as roles where roles.id_ in (select role_id_ from ibps_party_user_role where user_id_ = users.id_)) as roleAlias, ifnull(o.name_, '') as groupName from ibps_party_employee users left join ibps_party_user_role ur on users.id_ = ur.user_id_ left join ibps_party_role r on r.id_ = ur.role_id_ left join ibps_party_org o on o.id_ = users.group_id_ where users.status_ = 'actived' and users.id_ <> '-1' group by users.id_
             `
             `
             request('sql', sql).then(res => {
             request('sql', sql).then(res => {
                 const { data = [] } = res.variables || {}
                 const { data = [] } = res.variables || {}

+ 6 - 6
src/views/platform/examination/constants.js

@@ -1,17 +1,17 @@
 export const paperTypeOptions = [
 export const paperTypeOptions = [
     {
     {
-        label: '专业考试',
-        value: '专业考试'
+        label: '专业领域考试',
+        value: '专业领域考试'
     },
     },
     {
     {
         label: '职能岗位考题',
         label: '职能岗位考题',
         value: '职能岗位考题'
         value: '职能岗位考题'
-    },
-    {
-        label: 'ISO15189相关考试',
-        value: 'ISO15189相关考试'
     }
     }
     // {
     // {
+    //     label: 'ISO15189相关考试',
+    //     value: 'ISO15189相关考试'
+    // }
+    // {
     //     label: '数学题库',
     //     label: '数学题库',
     //     value: '数学题库'
     //     value: '数学题库'
     // }
     // }