通讯录查询修改

src/main/java/com/whdc/service/impl/VersionsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.whdc.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -63,7 +64,7 @@ public class VersionsServiceImpl extends ServiceImpl<VersionsMapper, Versions> i
 
         // 添加日志
         Versions entity = new Versions(null,
-                JSON.toJSONString(model), model.getId(), ++version, model.getCreateId(), new Date(),versionsType.getName(),
+                JSON.toJSONString(model), model.getId(), ++version, String.valueOf(StpUtil.getLoginId()), new Date(),versionsType.getName(),
                 null, null
         );
 

src/main/resources/mapper/VersionsMapper.xml

@@ -8,10 +8,10 @@
         LEFT JOIN FXKH_TXL.USERS U ON V.CREATE_ID = U.ID
         LEFT JOIN FXKH_TXL.ADDRESS_BOOK A ON U.AB_ID = A.ID
         <where>
-            <if test="dto.name != null">
+            <if test="dto.name != null and dto.name != '' ">
                 AND A.NAME = #{dto.name}
             </if>
-            <if test="dto.phone != null">
+            <if test="dto.phone != null and dto.phone != '' ">
                 AND A.PHONE = #{dto.phone}
             </if>
         </where>