Merge branch 'saff_update_feature' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppShareholderDetailChangeRecordBiz.java

@@ -41,13 +41,13 @@ public class AppShareholderDetailChangeRecordBiz extends BaseBiz<AppShareholderD
      * 查询员工信息变更记录表
      */
     public List<AppShareholderDetailChangeRecord> findShareholderChangeRecord(AppShareholderDetail appShareholderDetail) {
-        Example example = new Example(AppShareholderDetailChangeRecord.class);
+      /*  Example example = new Example(AppShareholderDetailChangeRecord.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("userId", appShareholderDetail.getId());
         if (appShareholderDetail.getPhone() != null) {
             criteria.andEqualTo("phone", appShareholderDetail.getPhone());
-        }
-        List<AppShareholderDetailChangeRecord > list = mapper.selectByExample(example);
+        }*/
+        List<AppShareholderDetailChangeRecord> list = mapper.selectAppshareholderUserOrPhoneOrUserId(appShareholderDetail.getId(), appShareholderDetail.getPhone());
         return list;
     }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppShareholderDetailChangeRecordMapper.java

 package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.entity.AppShareholderDetailChangeRecord;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 public interface AppShareholderDetailChangeRecordMapper extends Mapper<AppShareholderDetailChangeRecord> {
+    List<AppShareholderDetailChangeRecord> selectAppshareholderUserOrPhoneOrUserId(@Param("userId") Integer userId, @Param("phone") String phone);
+
 }

ace-modules/ace-admin/src/main/resources/mapper/AppShareholderDetailChangeRecord.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.github.wxiaoqi.security.admin.mapper.AppShareholderDetailChangeRecordMapper">
-    <resultMap id="appShareholderDetailMap" type="com.github.wxiaoqi.security.admin.entity.AppShareholderDetailChangeRecord">
+    <resultMap id="appShareholderDetailMap"
+               type="com.github.wxiaoqi.security.admin.entity.AppShareholderDetailChangeRecord">
         <result property="id" column="id"/>
         <result property="companyName" column="company_name"/>
         <result property="userId" column="user_id"/>
@@ -13,6 +14,20 @@
         <result property="relTime" column="rel_time"/>
     </resultMap>
 
+    <select id="selectAppshareholderUserOrPhoneOrUserId"
+            resultType="com.github.wxiaoqi.security.admin.entity.AppShareholderDetailChangeRecord">
+        SELECT *from
+        app_shareholder_detail_change_record
+        WHERE
+        1=1
+        <if test="userId!=null">
+            and user_id=#{userId}
+        </if>
+        <if test="phone!=null">
+            or phone=#{phone}
+        </if>
+        ORDER BY crt_time DESC
+    </select>
 
 
 </mapper>