bug 修复

@@ -8,8 +8,7 @@ import (
 )
 )
 
 
 type UserDepartment struct {
 type UserDepartment struct {
-	Id int64 `orm:"column(id);auto" description:"主键"`
-	//UserId        int64     `orm:"column(user_id)" description:"用户id"`
+	Id            int64     `orm:"column(id);auto" description:"主键"`
 	CompanyId     int64     `orm:"column(company_id)" description:"公司id"`
 	CompanyId     int64     `orm:"column(company_id)" description:"公司id"`
 	DepartmentId  int64     `orm:"column(department_id)" description:"部门id"`
 	DepartmentId  int64     `orm:"column(department_id)" description:"部门id"`
 	CreateTime    time.Time `orm:"column(create_time);type(timestamp);null" description:"创建时间"`
 	CreateTime    time.Time `orm:"column(create_time);type(timestamp);null" description:"创建时间"`
@@ -68,46 +67,6 @@ func AddUserDepartment(m *UserDepartment, om ...orm.Ormer) (id int64, err error)
 	return
 	return
 }
 }
 
 
-// GetUserDepartmentById retrieves UserDepartment by Id. Returns error if
-// Id doesn't exist
-// func GetUserDepartmentById(id int64) (v *UserDepartment, err error) {
-// 	o := orm.NewOrm()
-// 	v = &UserDepartment{Id: id}
-// 	if err = o.Read(v); err == nil {
-// 		return v, nil
-// 	}
-// 	return nil, err
-// }
-
-// UpdateUserDepartment updates UserDepartment by Id and returns error if
-// the record to be updated doesn't exist
-// func UpdateUserDepartmentById(m *UserDepartment) (err error) {
-// 	o := orm.NewOrm()
-// 	v := UserDepartment{Id: m.Id}
-// 	// ascertain id exists in the database
-// 	if err = o.Read(&v); err == nil {
-// 		var num int64
-// 		if num, err = o.Update(m); err == nil {
-// 			fmt.Println("Number of records updated in database:", num)
-// 		}
-// 	}
-// 	return
-// }
-
-// func GetUserDepartment(userid, companyid int64) ([]*UserDepartment, error) {
-// 	o := orm.NewOrm()
-// 	var (
-// 		err    error
-// 		result []*UserDepartment
-// 	)
-// 	_, err = o.QueryTable(&UserDepartment{}).
-// 		Filter("user_id", userid).
-// 		Filter("company_id", companyid).
-// 		Filter("enable_status", 1).
-// 		All(&result)
-// 	return result, err
-// }
-
 func CountUserDepartByDepart(departid int64) (int64, error) {
 func CountUserDepartByDepart(departid int64) (int64, error) {
 	var (
 	var (
 		cnt int64
 		cnt int64
@@ -142,7 +101,7 @@ func ExistUserDepart(departid int64, usercompanyid int64) bool {
 	ok = o.QueryTable(&UserDepartment{}).
 	ok = o.QueryTable(&UserDepartment{}).
 		Filter("department_id", departid).
 		Filter("department_id", departid).
 		Filter("user_company_id", usercompanyid).
 		Filter("user_company_id", usercompanyid).
-		Filter("delete_at", 0).
+		Filter("enable_status", USER_DEPARTMENT_ENABLE_YES).
 		Exist()
 		Exist()
 	return ok
 	return ok
 }
 }