拉去部门所有用户，部门

src/dashoo.cn/backend/api/business/organize/organizeService.go

@@ -142,9 +142,9 @@ func (s *OrganizeService) UserInRoleById(userId, RoleId string) bool {
 }
 
 //获得category为unit的父节点
-func (s *OrganizeService) GetMyUnitDepartmentId(topid, uid string) string {
+func (s *OrganizeService) GetMyUnitDepartmentId(topid string) string {
 	var entity Base_Organize
-	ids := s.GetAllParentByTopId(topid, uid)
+	ids := s.GetAllParentByTopAccCode(topid, "")
 	if len(ids) <= 0 { //没有父节点
 		return topid
 	}

src/dashoo.cn/backend/api/controllers/casbin/organize.go

@@ -35,7 +35,9 @@ type OrganizeModel struct {
 func (this *OrganizesController) List() {
 	page := this.GetPageInfoForm()
 	svc := organize.GetOrganizeService(utils.DBE)
-	where := " ( Createuserid=" + this.User.Id + " or id = " + this.User.DepartmentId + ")"
+	topid := svc.GetMyUnitDepartmentId(this.User.DepartmentId)
+	depids := svc.GetAllChildById(topid)
+	where := "( Createuserid=" + this.User.Id + " or id in (" + depids + "))"
 	keyword := this.GetString("keyword")
 	parentid := this.GetString("parentid")
 	IsInnerOrganize := this.GetString("IsInnerOrganize")
@@ -93,7 +95,9 @@ func (this *OrganizesController) Detailed() {
 func (this *OrganizesController) Listbandparentname() {
 	page := this.GetPageInfoForm()
 	svc := organize.GetOrganizeService(utils.DBE)
-	where := "( a.Createuserid=" + this.User.Id + " or a.id = " + this.User.DepartmentId + ")"
+	topid := svc.GetMyUnitDepartmentId(this.User.DepartmentId)
+	depids := svc.GetAllChildById(topid)
+	where := "( a.Createuserid=" + this.User.Id + " or a.id in (" + depids + "))"
 	keyword := this.GetString("keyword")
 	parentid := this.GetString("parentid")
 	IsInnerOrganize := this.GetString("IsInnerOrganize")

src/dashoo.cn/backend/api/controllers/casbin/user.go

@@ -141,9 +141,11 @@ func (this *UserController) List() {
 	keyword := this.GetString("keyword")
 	IsCompanyUser := this.GetString("IsCompanyUser")
 	svc := permission.GetPermissionService(utils.DBE)
+	organsvc := organize.GetOrganizeService(utils.DBE)
 	var users []userRole.Base_User
-
-	where := "IsVisible=1 and IsCompanyUser = 0 and CreateUserId='" + utils.ToStr(this.User.Id) + "' or Id = '" + utils.ToStr(this.User.Id) + "' "
+	topid := organsvc.GetMyUnitDepartmentId(this.User.DepartmentId)
+	depids := organsvc.GetAllChildById(topid)
+	where := "IsVisible=1 and IsCompanyUser = 0 and DepartmentId in (" + depids + ") or Id = '" + utils.ToStr(this.User.Id) + "' "
 	//外部用户 IsCompanyUser == 1
 	if IsCompanyUser == "1" {
 		where = "IsVisible=1 and IsCompanyUser = 1 and CreateUserId='" + utils.ToStr(this.User.Id) + "' or Id = '" + utils.ToStr(this.User.Id) + "' "