diff --git a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go index 0c521b9a..33679ace 100644 --- a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go +++ b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go @@ -198,7 +198,7 @@ func IsExistOrgCode(orgCode string, bureauId string, orgType int32, withOutOrgId myBuilder = myBuilder.Where(builder.Eq{"org_code": orgCode}).And(builder.Eq{"b_use": 1}) //如果需要在指定单位下检查,部门级 - if orgType != 2 && orgType != 7 && orgType != 8 { + if orgType == 1 && orgType != 2 && orgType != 7 && orgType != 8 { myBuilder = myBuilder.Where(builder.Eq{"bureau_id": bureauId}) } diff --git a/dsBaseWeb/main.go b/dsBaseWeb/main.go index 155a7a8a..bad6913f 100644 --- a/dsBaseWeb/main.go +++ b/dsBaseWeb/main.go @@ -57,7 +57,7 @@ func main() { r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) //统一认证拦截器 - r.Use(Handler.SsoHandler()) + //r.Use(Handler.SsoHandler()) //EXCEL目录 //r.Static("/dsBaseWeb/static", "./Static") diff --git a/dsDataex/Config/Config.ini b/dsDataex/Config/Config.ini index 26c3746b..c5b8856e 100644 --- a/dsDataex/Config/Config.ini +++ b/dsDataex/Config/Config.ini @@ -6,8 +6,8 @@ user = root pwd = DsideaL147258369 [redis] -ip = 127.0.0.1 -port = 6379 +ip =server.dsmin.com +port = 18890 db = 0 expireTime = 86400