From 5a6c0ae7fc7a9db0432ffa459081c8915bd7d50b Mon Sep 17 00:00:00 2001 From: huanghai <10402852@qq.com> Date: Mon, 6 Jul 2020 15:55:40 +0800 Subject: [PATCH 1/3] 'commit' --- .../RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go index 05d8e149..f9687a6c 100644 --- a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go +++ b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go @@ -296,7 +296,7 @@ func ExportTeacherInfoExcel(targetPath string, bureauId string, ExportExcelStatu t1.mzm,t1.zzmmm,t1.sfzjlxm, (case t1.sfzjh when '-1' then '' else t1.sfzjh end ) as sfzjh, t1.xlm,t1.xwm,t1.zcm,t1.bzlbm,t1.stage_id,t1.subject_id,t1.gwzym,t1.lxdh,t1.dzxx from t_base_teacher as t1 inner join t_base_organization as t2 on t1.org_id=t2.org_id - where t1.bureau_id=? and t1.identity_id=2` + where t1.bureau_id=? and t1.identity_id=2 and t1.b_use=1` list, _ := db.SQL(sql, bureauId).Query().List() for i := range list { record := list[i] From a1396f3f39c74bc901dde3dc8977ee0c151786c7 Mon Sep 17 00:00:00 2001 From: huanghai <10402852@qq.com> Date: Mon, 6 Jul 2020 17:03:25 +0800 Subject: [PATCH 2/3] 'commit' --- .../BaseOrganizationDao/BaseOrganizationDao.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go index c8d996dc..e1bfb5a2 100644 --- a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go +++ b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go @@ -101,12 +101,16 @@ func UpdateBaseOrganization(model models.TBaseOrganization, ForceUpdateFields [] for i := range list { u := new(models.TBaseOrganization) u.SortId = model.SortId + int32(i+1) - id := list[i]["org_id"] + id := list[i]["org_id"].(string) _, err := session.ID(id).Update(u) if err != nil { session.Rollback() return 0, err } + //删除缓存 + var ids = []string{id} + var selector = SqlKit.GetBean("t_base_organization") + SqlKit.DeleteCacheByIds(ids, selector) } //事务提交 err := session.Commit() From 42bb847519a1d29dfe557f7d9bf8bf0edc852694 Mon Sep 17 00:00:00 2001 From: huanghai <10402852@qq.com> Date: Tue, 7 Jul 2020 08:32:58 +0800 Subject: [PATCH 3/3] 'commit' --- .../BaseRolePerson/BaseRolePersonDao/BaseRolePersonDao.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dsBaseRpc/RpcService/BaseRolePerson/BaseRolePersonDao/BaseRolePersonDao.go b/dsBaseRpc/RpcService/BaseRolePerson/BaseRolePersonDao/BaseRolePersonDao.go index 1f7a4f54..219fd854 100644 --- a/dsBaseRpc/RpcService/BaseRolePerson/BaseRolePersonDao/BaseRolePersonDao.go +++ b/dsBaseRpc/RpcService/BaseRolePerson/BaseRolePersonDao/BaseRolePersonDao.go @@ -228,14 +228,14 @@ func GetManageArea(personId string, AreaType int32) ([]map[string]interface{}, i areaIds = append(areaIds, list[i]["rule_id"].(string)) } } - var myBuilder = builder.Dialect(builder.MYSQL).Select("area_code,area_name,if(substring(master_code,3,5)='0000','-1',master_code) as parent_code"). - From("t_gov_area").Where(builder.In("area_code", areaIds)) + var myBuilder = builder.Dialect(builder.MYSQL).Select("t1.area_code,t1.area_name,(select t2.area_name from t_gov_area as t2 where t2.area_code=t1.master_code) as parent_name,if(substring(t1.master_code,3,5)='0000','-1',t1.master_code) as parent_code"). + From("t_gov_area as t1").Where(builder.In("t1.area_code", areaIds)) //只要市 if AreaType == 1 { - myBuilder.And(builder.Eq{"area_level_id": 2}) + myBuilder.And(builder.Eq{"t1.area_level_id": 2}) } else //只要县区 { - myBuilder.And(builder.Eq{"area_level_id": 3}) + myBuilder.And(builder.Eq{"t1.area_level_id": 3}) } sql, err := myBuilder.ToBoundSQL() if err != nil {