'commit'

dsBaseRpc/Config/ImportExcelTemplate/teacher.json

@@ -94,16 +94,6 @@
         "bzlbm"
       ]
     },
-    {
-      "col_name": "岗位",
-      "level_1_sql": true,
-      "width": 16,
-      "require": true,
-      "sql_num": 1,
-      "sql_parameter": [
-        "gwzym"
-      ]
-    },
     {
       "col_name": "任课学段",
       "require": true,
@@ -118,10 +108,6 @@
     {
       "col_name": "联系电话",
       "width": 20
-    },
-    {
-      "col_name": "电子信箱",
-      "width": 30
     }
   ]
 }

dsBaseRpc/Jira地址.txt

@@ -0,0 +1,4 @@
+http://10.10.6.162:8000/secure/Dashboard.jspa
+
+wubin
+123456

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go

@@ -13,7 +13,6 @@ import (
 	"dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonService"
 	"dsBaseRpc/Utils/CommonUtil"
 	"dsBaseRpc/Utils/DateUtil"
-	"dsBaseRpc/Utils/EmailUtil"
 	"dsBaseRpc/Utils/ExcelUtil"
 	"dsBaseRpc/Utils/IdCardUtil"
 	"dsBaseRpc/Utils/LogUtil"
@@ -77,20 +76,6 @@ func (s *Rpc) AddBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
 		reply.Message = "联系电话在系统中已存在，无法创建！"
 		return &reply, nil
 	}
-	//==========================================
-	//如果是电子信箱，是不是合法
-	if len(in.Dzxx) > 0 && !EmailUtil.VerifyEmailFormat(in.Dzxx) {
-		reply.Success = false
-		reply.Message = "电子信箱格式不合法！"
-		return &reply, nil
-	}
-	//是不是重复
-	if len(in.Dzxx) > 0 && !SysLoginpersonDao.IsValidIdEmail(in.Dzxx, "") {
-		reply.Success = false
-		reply.Message = "电子信箱已存在，无法创建！"
-		return &reply, nil
-	}
-	//==========================================
 	//调用dao
 	model := new(models.TBaseTeacher)
 	model.PersonId = CommonUtil.GetUUID()
@@ -251,18 +236,6 @@ func (s *Rpc) UpdateBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelA
 		return &reply, nil
 	}
 
-	if len(in.Dzxx) > 0 && !EmailUtil.VerifyEmailFormat(in.Dzxx) {
-		reply.Success = false
-		reply.Message = "电子信箱格式不合法！"
-		return &reply, nil
-	}
-	//是不是重复
-	if len(in.Dzxx) > 0 && !SysLoginpersonDao.IsValidIdEmail(in.Dzxx, in.PersonId) {
-		reply.Success = false
-		reply.Message = "电子信箱已存在，无法创建！"
-		return &reply, nil
-	}
-
 	//3、修改
 	model := new(models.TBaseTeacher)
 	model.PersonId = in.PersonId