From 6bef666d0555c159e7a4387003c24614579ada59 Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Mon, 23 Nov 2020 12:55:50 +0800
Subject: [PATCH] 'commit'

---
 baseServiceJava/WebRoot/html/pages/tea/teaList.html | 1 +
 baseServiceJava/src/main/resources/Sql/teacher.sql  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/baseServiceJava/WebRoot/html/pages/tea/teaList.html b/baseServiceJava/WebRoot/html/pages/tea/teaList.html
index a31d6db..6dcbc7b 100644
--- a/baseServiceJava/WebRoot/html/pages/tea/teaList.html
+++ b/baseServiceJava/WebRoot/html/pages/tea/teaList.html
@@ -265,6 +265,7 @@
                     , {field: 'person_name', title: '教师姓名', align: 'center'}
                     , {field: 'xb', title: '性别', align: 'center'}
                     , {field: 'org_name', title: '部门', align: 'center'}
+                    , {field: 'identity_name', title: '身份', align: 'center'}
                     , {field: 'login_name', title: '登录名', align: 'center'}
                     , {field: 'original_pwd', title: '初始密码', align: 'center'}
                     , {fixed: 'right', title: '操作', toolbar: '#barDemo', align: 'center', width: 480, fixed: 'right'}
diff --git a/baseServiceJava/src/main/resources/Sql/teacher.sql b/baseServiceJava/src/main/resources/Sql/teacher.sql
index fab2a86..b50cfea 100644
--- a/baseServiceJava/src/main/resources/Sql/teacher.sql
+++ b/baseServiceJava/src/main/resources/Sql/teacher.sql
@@ -8,6 +8,7 @@
         t1.login_name,
         IFNULL(t1.xb, '1') AS xb,
         t1.original_pwd,
+        (case t1.identity_id when 2 then '申报员' when 3 then '一级审核员' when 4 then '二级审核员' end) as identity_name,
         t1.pwd,
         (select count(*) as c from t_transfer_apply as t2  where t2.person_id=t1.person_id and t2.status_id=1 and t2.b_use=1)
         as apply_status,