Merge branch 'saff_update_feature' into dev

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

@@ -191,9 +191,10 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
      */
     public List<AppUserPositionChangeRecordDTO> findPositionChangeRecord(AppUserPositionTemp userPositionTemp) {
         Example example = new Example(AppUserPositionChangeRecord.class);
-        example.createCriteria().andEqualTo("phone", userPositionTemp.getPhone());
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("userId", userPositionTemp.getId());
         if (userPositionTemp.getId() != null) {
-            example.createCriteria().andEqualTo("userId", userPositionTemp.getId());
+            criteria.andEqualTo("phone", userPositionTemp.getPhone());
         }
         List<AppUserPositionChangeRecord> list = selectByExample(example);
         List<AppUserPositionChangeRecordDTO> listAppUserPositionChangeRecordDTO = new ArrayList<>();