Pre Merge pull request !41 from 阿斌/N/A

还有以下一处需要修改web\src\layout\components\dialog\changePassword.vue

Signed-off-by: 阿斌 <38912748@qq.com>

src/main/java/com/genersoft/iot/vmp/gb28181/dao/GroupMapper.java

@@ -156,7 +156,8 @@ public interface GroupMapper {
             " wcg.name as gb_name," +
             " wcg.business_group as gb_business_group_id," +
             " 1 as gb_parental," +
-            " wcg.parent_device_id as gb_parent_id" +
+            " wcg.parent_device_id as gb_parent_id," +
+            " wcg.civil_code as gb_civil_code" +
             " from wvp_common_group wcg" +
             " left join wvp_platform_group wpg on wpg.group_id = wcg.id" +
             " where wpg.platform_id = #{platformId} " +

src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java

@@ -53,8 +53,8 @@ public interface StreamPushMapper {
             " 1=1 " +
             " <if test='query != null'> AND (st.app LIKE concat('%',#{query},'%') escape '/' OR st.stream LIKE concat('%',#{query},'%') escape '/' " +
             " OR wdc.gb_device_id LIKE concat('%',#{query},'%') escape '/' OR wdc.gb_name LIKE concat('%',#{query},'%') escape '/')</if> " +
-            " <if test='pushing == true' > AND st.pushing=1</if>" +
-            " <if test='pushing == false' > AND st.pushing=0 </if>" +
+            " <if test='pushing == true' > AND st.pushing=true</if>" +
+            " <if test='pushing == false' > AND st.pushing=false </if>" +
             " <if test='mediaServerId != null' > AND st.media_server_id=#{mediaServerId} </if>" +
             " order by st.create_time desc" +
             " </script>"})

web/src/views/dialog/changePasswordForAdmin.vue

@@ -13,10 +13,10 @@
       <div id="shared" style="margin-right: 20px;">
         <el-form ref="passwordForm" :rules="rules" status-icon label-width="80px">
           <el-form-item label="新密码" prop="newPassword">
-            <el-input v-model="newPassword" autocomplete="off" />
+            <el-input v-model="newPassword" autocomplete="off" type="password" />
           </el-form-item>
           <el-form-item label="确认密码" prop="confirmPassword">
-            <el-input v-model="confirmPassword" autocomplete="off" />
+            <el-input v-model="confirmPassword" autocomplete="off" type="password" />
           </el-form-item>
 
           <el-form-item>
@@ -88,6 +88,14 @@ export default {
       }
     },
     onSubmit: function() {
+      if (this.newPassword !== this.confirmPassword) {
+        this.$message({
+          showClose: true,
+          message: '两次输入密码不一致！',
+          type: 'error'
+        })
+        return
+      }
       this.$store.dispatch('user/changePasswordForAdmin', {
         password: this.newPassword,
         userId: this.form.id