diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
index a7d1e3d..ca9e06f 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
@@ -53,18 +53,15 @@
         contentTypeViewModel.obtainAlarmContentType(alarmType = "1")
         contentTypeViewModel.listModel.observe(this, {
             if (it.code == 200) {
-                it.data!!.list?.forEachIndexed { index, dataBean ->
-                    val bean: AlarmContentTypeModel.DataBean.ListBean
-                    if (index == 0) {
-                        bean = AlarmContentTypeModel.DataBean.ListBean()
-                        bean.value = ""
-                        bean.name = "全部"
-                        bean.alarmType = ""
-                        bean.deviceType = ""
-                    } else {
-                        bean = dataBean
-                    }
-                    contentModels.add(bean)
+                //构造一个默认值
+                val bean = AlarmContentTypeModel.DataBean.ListBean()
+                bean.value = ""
+                bean.name = "全部"
+                bean.alarmType = ""
+                bean.deviceType = ""
+                contentModels.add(bean)
+                it.data!!.list?.forEach { contentTypeBean ->
+                    contentModels.add(contentTypeBean)
                 }
                 contentTypeAdapter =
                     object : TagAdapter<AlarmContentTypeModel.DataBean.ListBean>(contentModels) {
@@ -74,7 +71,7 @@
                         ): View {
                             val tagView = inflater.inflate(
                                 R.layout.item_tag_flowlayout,
-                                orderStatusLayout, false
+                                alarmContentLayout, false
                             ) as TextView
                             tagView.text = contentModels[position].name
                             return tagView
@@ -103,7 +100,7 @@
             ): View {
                 val tagView = inflater.inflate(
                     R.layout.item_tag_flowlayout,
-                    orderStatusLayout, false
+                    alarmLevelLayout, false
                 ) as TextView
                 tagView.text = levelMaps[position]["name"]
                 return tagView
@@ -119,17 +116,14 @@
         orderStatusViewModel.obtainOrderStatus()
         orderStatusViewModel.listModel.observe(this, {
             if (it.code == 200) {
-                it.data!!.forEachIndexed { index, dataBean ->
-                    val bean: OrderStatusModel.DataBean
-                    if (index == 0) {
-                        bean = OrderStatusModel.DataBean()
-                        bean.name = "全部"
-                        bean.id = ""
-                        bean.value = ""
-                    } else {
-                        bean = dataBean
-                    }
-                    orderStatusModels.add(bean)
+                //构造一个默认值
+                val bean = OrderStatusModel.DataBean()
+                bean.name = "全部"
+                bean.id = ""
+                bean.value = ""
+                orderStatusModels.add(bean)
+                it.data!!.forEach { statusBean ->
+                    orderStatusModels.add(statusBean)
                 }
                 orderStatusAdapter =
                     object : TagAdapter<OrderStatusModel.DataBean>(orderStatusModels) {