update

dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go

@@ -157,8 +157,8 @@ func PageBaseOrganization(in *BaseOrganizationProto.QueryArg) ([]map[string]inte
 	if in.IsMainSchool {
 		myBuilder.Where(builder.In("t1.main_school_type", []int{1, 2}))
 		//如果要排除某个学校
-		if in.BureauId!=""{
-			myBuilder.Where(builder.Neq{"t1.org_id":in.BureauId})
+		if in.BureauId != "" {
+			myBuilder.Where(builder.Neq{"t1.org_id": in.BureauId})
 		}
 	}
 	myBuilder.Where(builder.Like{"t1.org_name", in.OrgName}).OrderBy("t1.sort_id asc,t1.id_int asc")
@@ -421,7 +421,7 @@ func SetEduStatus(ids []string, bUse int) error {
 */
 func GetChildOrg(orgId string) ([]map[string]interface{}, int32, error) {
 	var myBuilder = builder.Dialect(builder.MYSQL).Select("org_id").From("t_base_organization").
-		Where(builder.In("parent_id", orgId)).OrderBy("sort_id")
+		Where(builder.In("parent_id", orgId)).And(builder.Eq{"b_use": 1}).OrderBy("sort_id")
 	sql, err := myBuilder.ToBoundSQL()
 	if err != nil {
 		return nil, 0, err

dsBaseWeb/Business/BaseOrganization/BaseOrganizationController/BaseOrganizationController.go

@@ -59,7 +59,7 @@ func Routers(r *gin.RouterGroup) {
 // @Success 200 {object} Model.Res
 // @Router /base/organization/PageEnableEduInfo [get]
 // @X-EmptyLimit ["page","limit","areaCode"]
-// @X-LengthLimit [{"areaCode":"6,6"},{"orgName":"1,50"}]
+// @X-LengthLimit [{"areaCode":"6,6"},{"orgName":"1,20"}]
 // @X-IntRangeLimit [{"page":"1,1000"},{"limit":"1,1000"}]
 // @X-RoleLimit ["1"]
 // @X-TableName ["t_base_organization"]

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())
 
 	//前台页面目录
 	r.Static("/dsBaseWeb", "./Html")