'commit'

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go

@@ -97,7 +97,8 @@ func PageBaseTeacher(in *BaseTeacherProto.QueryArg) ([]map[string]interface{}, i
 	// 注意使用limit时要使用方言
 	// 注意两个表关联时的on用法：
 	var myBuilder = builder.Dialect(builder.MYSQL).Select("t1.*,t2.bureau_id,t2.org_id").
-		From("t_base_teacher as t1").LeftJoin("t_base_teacher_org as t2", "t1.person_id=t2.person_id").
+		From("t_base_teacher as t1").
+		LeftJoin("t_base_teacher_org as t2", "t1.person_id=t2.person_id and t2.b_use=1").
 		OrderBy("t2.sort_id")
 	//所在单位ID
 	list := SqlKit.QueryByIds([]string{in.OrgId}, "t_base_organization")
@@ -116,7 +117,6 @@ func PageBaseTeacher(in *BaseTeacherProto.QueryArg) ([]map[string]interface{}, i
 	myBuilder.And(builder.Like{"t1.xm", in.Xm})
 	//只要b_use=1
 	myBuilder.And(builder.Eq{"t1.b_use": 1})
-	myBuilder.And(builder.Eq{"t2.b_use": 1})
 	//只要identity_id=2
 	myBuilder.And(builder.Eq{"t1.identity_id": 2})
 	//分页

dsBaseRpc/Shell/debug.sh

@@ -2,6 +2,7 @@
 
 # 先杀掉内存中的进程
 kill -9 `pgrep -f dsBaseRpc` 2>/dev/null
+
 # 休息3秒
 sleep 3
 

dsBaseRpc/Shell/remote.sh

@@ -2,6 +2,7 @@
 
 # 先杀掉内存中的进程
 kill -9 `pgrep -f dsBaseRpc` 2>/dev/null
+
 # 休息3秒
 sleep 3