前后:二级管理员编辑用户信息组织显示问题

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

@@ -325,6 +325,24 @@ func (this *OrganizesController) ParentList() {
 	this.ServeJSON()
 }
 
+// @Title 获取父集列表all
+// @Description 获取父集列表
+// @Success 200 {object} business.device.DeviceChannels
+// @router /parentlistall/:id [get]
+func (this *OrganizesController) ParentListAll() {
+	id := this.Ctx.Input.Param(":id")
+	svc := organize.GetOrganizeService(utils.DBE)
+	var errinfo ErrorInfo
+	if this.User.Id == "1" {
+		errinfo.Message = svc.GetAllParentByTopId(id, "1")
+	} else {
+		errinfo.Message = strings.Replace(svc.GetAllParentByTopId(id, "1"), "100001250", "0", -1)
+	}
+	errinfo.Code = 0
+	this.Data["json"] = &errinfo
+	this.ServeJSON()
+}
+
 // @Title get 业务列表
 // @Description get SampleType by token
 // @Success 200 {object} sampletype.SampleType

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

@@ -437,14 +437,12 @@ func (this *UserController) EditUser() {
 		if model.Superior != "" {
 			//改所属单位
 			str := strings.Split(model.Superior, ",")
-			if str[0] == "100000000" {
-				if str[2] != "" {
-					var entity organize.Base_Organize
-					svc := organize.GetOrganizeService(utils.DBE)
-					svc.GetEntityById (str[2], &entity)
-					userentity.UnitId,_ = strconv.Atoi(str[2])
-					userentity.Unit = entity.Fullname
-				}
+			if str[0] == "100001250" && str[2] != "" {
+				var entity organize.Base_Organize
+				svc := organize.GetOrganizeService(utils.DBE)
+				svc.GetEntityById (str[2], &entity)
+				userentity.UnitId,_ = strconv.Atoi(str[2])
+				userentity.Unit = entity.Fullname
 			}
 		}
 		var cols []string = []string{"Realname", "CompanyId", "DepartmentId", "DepartmentName", "Telephone", "Mobile", "Description", "Photo", "Modifieduserid", "Modifiedby", "Superior", "Unit", "UnitId"}
@@ -696,7 +694,7 @@ func (this *UserController) UpdataUser2Org() {
 	var userlist []userRole.Base_User
 	var user1 userRole.Base_User
 	svc := userRole.GetUserService(utils.DBE)
-	svc.GetEntities(&userlist, "DepartmentId != ''")
+	svc.GetEntities(&userlist, "DepartmentId != '' and ModifiedOn < '2020-12-07 17:00:00'")
 	unitIdcopy := ""
 	fullname := ""
 	unitsvc := organize.GetOrganizeService(utils.DBE)
@@ -709,7 +707,8 @@ func (this *UserController) UpdataUser2Org() {
 		}
 		user1.UnitId,_ = strconv.Atoi(unitId)
 		user1.Unit = fullname
-		cols := []string{"UnitId", "Unit"}
+		user1.Modifiedon = time.Now()
+		cols := []string{"UnitId", "Unit", "ModifiedOn"}
 		unitsvc.UpdateEntityByIdCols(user.Id, &user1, cols)
 		unitIdcopy = unitId
 		fmt.Println(i)

src/dashoo.cn/frontend_web/src/pages/system/users.vue

@@ -502,7 +502,8 @@
           this.dialogtitle = '新增用户'
           this.disabledserial = false
         } else if (item === 2) {
-          this.$axios.get('organizes/parentlist/' + v.Departmentid, {})
+          // 11
+          this.$axios.get('organizes/parentlistall/' + v.Departmentid, {})
             .then(res => {
               if (res.data.code === 0) {
                 _this.dialogtitle = `编辑用户信息（${v.Realname}）`