添加任务信息

app/service/admin/dict_service/dict_type.go

@@ -139,7 +139,7 @@ func GetDictById(id int) (dict *sys_dict_type.Entity, err error) {
 }
 
 //通过字典键类型获取选项
-func GetDictWithDataByType(dictType string) (dict g.Map, err error) {
+func GetDictWithDataByType(dictType, defaultValue string) (dict g.Map, err error) {
 	dictEntity, err := sys_dict_type.Model.FindOne("dict_type", dictType)
 	if err != nil {
 		g.Log().Error(err)
@@ -158,9 +158,18 @@ func GetDictWithDataByType(dictType string) (dict g.Map, err error) {
 		}
 		values := make(g.List, len(dictDataEntities))
 		for k, v := range dictDataEntities {
+			isDefault := 0
+			if defaultValue != "" {
+				if defaultValue == v.DictValue {
+					isDefault = 1
+				}
+			} else {
+				isDefault = v.IsDefault
+			}
 			values[k] = g.Map{
-				"key":   v.DictValue,
-				"value": v.DictLabel,
+				"key":       v.DictValue,
+				"value":     v.DictLabel,
+				"isDefault": isDefault,
 			}
 		}
 		dict = g.Map{

app/service/admin/monitor_service/online.go

@@ -96,20 +96,21 @@ func ForceLogout(ids []int) error {
 		entity, err := user_online.Model.FindOne("id", id)
 		if err != nil {
 			g.Log().Error(err)
+			return gerror.New("获取在线用户信息失败")
 		}
-		if err != nil || entity == nil {
-			return gerror.New("获取用户在线信息失败")
+		if entity == nil {
+			continue
 		}
+		entity.Delete()
 		_, userKey := GetUuidUserKeyByToken(entity.Token)
 		if userKey == "" {
-			return gerror.New("用户信息获取失败")
+			continue
 		}
 		userKey = boot.AdminGfToken.CacheKey + userKey
 		_, err = g.Redis().Do("DEL", userKey)
 		if err != nil {
 			return err
 		}
-		entity.Delete()
 	}
 	return nil
 }