fix:用户相关BUG优化

lms/nladmin-system/src/main/java/org/nl/common/constants/GeneralDefinition.java

@@ -9,7 +9,7 @@ public class GeneralDefinition {
     /**
      * 默认密码
      */
-    public static final String DEFAULT_PASSWORD = "123456";
+    public static final String DEFAULT_PASSWORD = "HL123456";
     /**
      * 盐值加密
      */

lms/nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml

@@ -2,10 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.system.service.user.dao.mapper.SysUserMapper">
     <sql id="Base_Column_List">
-        sys_user
+        sys_user.user_id as userId,
-        .
-        user_id
-        as userId,
         sys_user.username as username,
         sys_user.person_name as personName,
         sys_user.gender,
@@ -86,13 +83,13 @@
                 and sys_user.is_used = #{query.is_used}
             </if>
             <if test="query.start_time  != null">
-                and and sys_user.create_time >= #{query.startTime}
+                and sys_user.create_time >= #{query.startTime}
             </if>
             <if test="query.end_time  != null">
                 and #{query.end_time} >= sys_user.create_time
             </if>
             <if test="query.blurry  != null">
-                and (email like #{query.blurry} or username like #{query.blurry} or person_name like #{query.blurry})
+                and (email like #{query.blurry} or username like concat('%',#{query.blurry},'%') or person_name like concat('%',#{query.blurry},'%'))
             </if>
         </where>
     </select>

lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java

@@ -125,7 +125,9 @@ public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> imp
         } catch (Exception ex) {
             throw new RuntimeException();
         }
-        sysUser.setPassword(SaSecureUtil.md5BySalt(sysUser.getPassword(), GeneralDefinition.SALT));
+        if (ObjectUtil.isNotEmpty(sysUser.getPassword())) {
+            sysUser.setPassword(SaSecureUtil.md5BySalt(sysUser.getPassword(), GeneralDefinition.SALT));
+        }
         sysUser.setUpdate_time(new Date());
         sysUser.setUpdate_id(SecurityUtils.getCurrentUserId());
         this.updateById(sysUser);

lms/nladmin-ui/src/views/system/user/index.vue

@@ -91,7 +91,7 @@
               />
             </el-form-item>
             <br v-if="!crud.status.add">
-            <el-form-item label="密码" prop="password">
+            <el-form-item v-if="crud.status.add" label="密码" prop="password">
               <el-input v-model="form.password" style="width: 200px;" show-password auto-complete="new-password" />
             </el-form-item>
             <el-form-item label="性别">
@@ -372,8 +372,8 @@ export default {
         del: ['admin', 'user:del']
       },
       enabledTypeOptions: [
-        { key: true, display_name: '激活' },
+        { key: '1', display_name: '激活' },
-        { key: false, display_name: '锁定' }
+        { key: '0', display_name: '锁定' }
       ],
       rules: {
         username: [