Merge remote-tracking branch 'origin/feature_select_by_dept' into feature_select_by_dept

data-ui/src/views/data/digitalwater/length/index.vue

@@ -219,7 +219,7 @@
                           placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'"/>
             </el-form-item>
             <el-form-item label="排序" prop="sort">
-              <el-input-number controls-position="right" v-model="form.sort" placeholder="请输入排序" maxlength="50" :min="1" :max="99999"/>
+              <el-input-number  v-model="form.sort" placeholder="请输入排序"  :min="1" :max="99999"></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -454,7 +454,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        sort: null,
+        sort: 99,
         id: null,
         userId: null,
         name: null,

src/main/java/com/sooka/sponest/data/digitalwater/domain/WaterConservancyViewBO.java

@@ -40,6 +40,9 @@ public class WaterConservancyViewBO extends BaseBusinessEntity {
     //名称
     @ApiModelProperty(value = "名称", required = false)
     private String name;
+    //排序
+    @ApiModelProperty(value = "排序", required = false)
+    private Long sort;
 
     //类型（2.河长 3.路长 6.田长）
     @ApiModelProperty(value = "类型（2.河长 3.路长 6.田长）", required = false)

src/main/resources/mapper/digitalwater/WaterConservancyViewMapper.xml

@@ -130,13 +130,15 @@
 
     <select id="getTianList" parameterType="WaterConservancyViewBO" resultType="map">
         SELECT
-            GROUP_CONCAT( a.gridId ) gridId, `name`,  phone, id
+            GROUP_CONCAT( a.gridId ) gridId, `name`,  phone, id,sort,create_time createTime
         FROM(
             SELECT
                 DISTINCT a.user_id userId,
                 a.id,
                 a.`name`,
                 a.phone,
+                a.sort,
+                a.create_time,
                 a.grid_id gridId
             FROM
                 centerdata_t_hydraulic_river_length a
@@ -146,6 +148,7 @@
             ) a
         GROUP BY
             a.userId
+        order by a.sort asc,a.create_time desc
     </select>
 
     <select id="getGridList" parameterType="WaterConservancyViewBO" resultType="map">