|
|
@@ -148,16 +148,16 @@ func (s *StoreEntry) CowTransferPenReasonOptions(ctx context.Context) (*pastureP
|
|
|
|
|
|
// SystemUserOptions 系统用户下拉框 todo 待优化
|
|
|
func (s *StoreEntry) SystemUserOptions(ctx context.Context, depId int) (*pasturePb.ConfigOptionsListResponse, error) {
|
|
|
- userModel, err := s.GetUserModel(ctx)
|
|
|
+ _, err := s.GetUserModel(ctx)
|
|
|
if err != nil {
|
|
|
return nil, xerr.WithStack(err)
|
|
|
}
|
|
|
|
|
|
systemUserList := make([]*model.SystemUser, 0)
|
|
|
pref := s.DB.Table(new(model.SystemUser).TableName()).
|
|
|
- Where("FIND_IN_SET('?',pasture_ids) > 0", userModel.AppPasture.Id).
|
|
|
+ //Where("FIND_IN_SET('?',pasture_ids) > 0", userModel.AppPasture.Id).
|
|
|
Where("is_delete = ?", pasturePb.IsShow_Ok).
|
|
|
- Where("is_show =? ", pasturePb.IsShow_Ok)
|
|
|
+ Where("is_show = ? ", pasturePb.IsShow_Ok)
|
|
|
if depId != -1 && depId > 0 {
|
|
|
pref = pref.Where("FIND_IN_SET('?',dept_ids) > 0", depId)
|
|
|
}
|
Yi