diff --git a/baseServiceJava/src/main/java/com/dsideal/baseService/ExcelImportTemplate/TeacherImportExcelUtil.java b/baseServiceJava/src/main/java/com/dsideal/baseService/ExcelImportTemplate/TeacherImportExcelUtil.java
index 3e8301e..341607b 100644
--- a/baseServiceJava/src/main/java/com/dsideal/baseService/ExcelImportTemplate/TeacherImportExcelUtil.java
+++ b/baseServiceJava/src/main/java/com/dsideal/baseService/ExcelImportTemplate/TeacherImportExcelUtil.java
@@ -498,7 +498,7 @@ public class TeacherImportExcelUtil {
Record record = new Record();
String loginName = "tea" + pk;
record.set("person_id", rs.get(i).getStr("person_id"));
- record.set("identity_id", "5");
+ record.set("identity_id", "2");
record.set("login_name", loginName);
//生成6位随机明文密码
String originalPwd = CommonUtil.getSixRandom();
diff --git a/baseServiceJava/src/main/java/com/dsideal/baseService/Teacher/model/TeacherModel.java b/baseServiceJava/src/main/java/com/dsideal/baseService/Teacher/model/TeacherModel.java
index 37fd9b8..f452b2a 100644
--- a/baseServiceJava/src/main/java/com/dsideal/baseService/Teacher/model/TeacherModel.java
+++ b/baseServiceJava/src/main/java/com/dsideal/baseService/Teacher/model/TeacherModel.java
@@ -30,12 +30,12 @@ public class TeacherModel {
boolean flag = false;
String personId = UUID.randomUUID().toString().toUpperCase();
try {
- long pk = PkUtil.GetPersonNumPk(5, 1);
+ long pk = PkUtil.GetPersonNumPk(2, 1);
String loginName = "tea" + pk;
Record record = new Record();
record.set("person_id", personId);
- record.set("identity_id", "5");
+ record.set("identity_id", "2");
record.set("login_name", loginName);
record.set("pwd", pwd);
record.set("person_name", person_name);
@@ -118,7 +118,7 @@ public class TeacherModel {
Record record = list.get(0);
record.set("person_id", person_id);
- record.set("identity_id", "5");
+ record.set("identity_id", "2");
record.set("person_name", person_name);
record.set("xb", xb);
record.set("mz", mz);
diff --git a/baseServiceJava/src/main/resources/Sql/teacher.sql b/baseServiceJava/src/main/resources/Sql/teacher.sql
index 6ff6994..fab2a86 100644
--- a/baseServiceJava/src/main/resources/Sql/teacher.sql
+++ b/baseServiceJava/src/main/resources/Sql/teacher.sql
@@ -17,7 +17,7 @@
LEFT JOIN t_base_organization as t2 on t2.org_id = t1.org_id
WHERE
t1.b_use = 1
- AND t1.identity_id = 5
+ AND t1.identity_id in (2,3,4)
#if(org_id)
AND (t1.org_id = '#(org_id)' or t1.person_id in (select person_id from t_base_teacher_org where org_id='#(org_id)'))
@@ -43,7 +43,7 @@
t_sys_loginperson as t1
WHERE
t1.b_use = 1
- AND t1.identity_id = 5
+ AND t1.identity_id in (2,3,4)
AND t1.bureau_id = #para(0) order by t1.sort_id
#end
@@ -64,7 +64,7 @@
LEFT JOIN t_base_organization as t2 on t2.org_id = t1.org_id
WHERE
t1.b_use = 1
- AND t1.identity_id = 5
+ AND t1.identity_id in (2,3,4)
#if(org_id)
AND t1.org_id = '#(org_id)'
#end
@@ -89,7 +89,7 @@
t_sys_loginperson as t1
WHERE
t1.b_use = 1
- AND t1.identity_id = 5
+ AND t1.identity_id in (2,3,4)
AND t1.bureau_id = #para(0)
AND t1.person_name LIKE concat('%',#para(1),'%') order by t1.sort_id
#end