合并

CODE/smart-community/operate-api/src/main/resources/mapper/ToUserMapper.xml

@@ -205,7 +205,7 @@
     LEFT JOIN to_sys_role sr ON to_sys_user_role.role_id = sr.id
     <where>
     <if test="loginName != null and loginName !=''" >
-      and tu.login_name = #{loginName,jdbcType=VARCHAR}
+      and tu.login_name like concat('%',#{loginName,jdbcType=VARCHAR},'%')
     </if>
     <if test="userName != null and userName !=''" >
       and tu.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%')

CODE/smart-community/property-api/src/main/resources/mapper/UserMapper.xml

@@ -28,7 +28,7 @@
         LEFT JOIN tp_sys_role sr ON tp_sys_user_role.role_id = sr.id
         <where>
             <if test="loginName != null and loginName !=''" >
-                and tu.login_name = #{loginName,jdbcType=VARCHAR}
+                and tu.login_name like concat('%',#{loginName,jdbcType=VARCHAR},'%')
             </if>
             <if test="userName != null and userName !=''" >
                 and tu.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%')

VUECODE/smart-operate-manage/src/views/account/user/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="root">
-    <el-form :inline="true" :model="v" class="form-listQuery">
+    <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item class="filter-item" label="姓名">
         <el-input v-model.trim="listQuery.userName" placeholder="姓名" />
       </el-form-item>

VUECODE/smart-property-manage/src/views/account/user/addUser.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
-      <el-form-item label="名称" prop="userName">
+      <el-form-item label="员工名称" prop="userName">
         <el-input v-model="ruleForm.userName"/>
       </el-form-item>
      <el-form-item class="filter-item" label="手机号" prop="loginName" >

VUECODE/smart-property-manage/src/views/account/user/editUser.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
-       <el-form-item label="活动名称" prop="userName">
+       <el-form-item label="员工名称" prop="userName">
           <el-input v-model="ruleForm.userName"/>
        </el-form-item>