Merge branch 'feature/bug-list' of xuyiping/kpt-tmr-group into develop

http/handler/pasture/forage_list.go

@@ -31,6 +31,7 @@ func AddForage(c *gin.Context) {
 		valid.Field(&req.ForageSourceName, valid.Required),
 		//valid.Field(&req.PlanTypeId, valid.Required, valid.Min(0), valid.Max(2)),
 		valid.Field(&req.PlanTypeName, valid.Required),
+		valid.Field(&req.MaterialType, valid.Required),
 		//valid.Field(&req.JumpWeight, valid.Required, valid.Min(0), valid.Max(50)),
 	); err != nil {
 		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
@@ -62,6 +63,7 @@ func EditForage(c *gin.Context) {
 		valid.Field(&req.CategoryName, valid.Required),
 		valid.Field(&req.UniqueEncode, valid.Required),
 		valid.Field(&req.ForageSourceId, valid.Required),
+		valid.Field(&req.MaterialType, valid.Required),
 	); err != nil {
 		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
 		return

module/backend/pasture_service.go

@@ -371,7 +371,7 @@ func (s *StoreEntry) SearchForageCategoryList(ctx context.Context, req *operatio
 	}
 
 	if req.ParentName != "" {
-		pref.Where("parent_name = ?", fmt.Sprintf("%s%s%s", "%", req.ParentName, "%"))
+		pref.Where("parent_name like ?", fmt.Sprintf("%s%s%s", "%", req.ParentName, "%"))
 	}
 
 	if req.Number != "" {
@@ -421,6 +421,7 @@ func (s *StoreEntry) EditForage(ctx context.Context, req *operationPb.AddForageR
 	updateData := &model.Forage{
 		Name:               req.Name,
 		CategoryId:         int64(req.CategoryId),
+		CategoryName:       req.CategoryName,
 		UniqueEncode:       req.UniqueEncode,
 		ForageSourceId:     req.ForageSourceId,
 		PlanTypeId:         req.PlanTypeId,

module/backend/system_service.go

@@ -26,6 +26,9 @@ func (s *StoreEntry) Auth(ctx context.Context, auth *operationPb.UserAuthData) (
 	if systemUser.Password != auth.Password {
 		return nil, xerr.Customf("密码错误，来自用户:%s", auth.UserName)
 	}
+	if systemUser.IsShow == operationPb.IsShow_NO {
+		return nil, xerr.Customf("该账号已被禁用，请联系管理员")
+	}
 
 	token, err := jwt.GenerateToken(systemUser.Name, systemUser.Password)
 	if err != nil {
@@ -157,11 +160,10 @@ func (s *StoreEntry) EditSystemUser(ctx context.Context, req *operationPb.AddSys
 		Name:         req.Name,
 		EmployeeName: req.EmployeeName,
 		Phone:        req.Phone,
-		CreateUser:   req.CreateUser,
 	}
 	updateData.SystemUserRoleFormat(req)
 
-	if err := s.DB.Model(new(model.SystemUser)).Omit("is_show", "password", "is_delete").
+	if err := s.DB.Model(new(model.SystemUser)).Omit("is_show", "password", "is_delete", "create_user").
 		Where("id = ?", systemUser.Id).
 		Updates(updateData).Error; err != nil {
 		return xerr.WithStack(err)