Merge remote-tracking branch 'origin/dev' into dev

src/main/java/org/rcisoft/sys/visit/service/impl/InvitedPersonServiceImpl.java

@@ -109,6 +109,10 @@ public class InvitedPersonServiceImpl extends ServiceImpl<InvitedPersonRepositor
         //获取当前用户手机号
         String phone = CyUserUtil.getUserInfoStrProp(cyJwtUtil.getToken(request), CyUserUtil.USER_PHONE);
 //        System.out.println("用户手机号" + phone);
+        // 设置默认排序方式
+        if (visitInfomation.getSort() == null || visitInfomation.getSort().equals("")){
+            visitInfomation.setSort("3");
+        }
 
         //查找对象
         IPage<VisitInfoMation> visitInfoMationIPage = invitedPersonRepository.queryVisitInfomationsPaged(paginationUtility, visitInfomation, phone);

src/main/resources/mapper/InvitedPersonMapper.xml

@@ -79,6 +79,9 @@
             <if test="entity.sort == '2'.toString()">
                 vi.visit_real_time
             </if>
+            <if test="entity.sort == '3'.toString()">
+                vi.visit_real_time desc
+            </if>
         </if>
     </select>