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

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerUserServiceImpl.java

@@ -308,7 +308,7 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
 
         // 如果昵称不为空，添加昵称模糊查询条件
         if (nickName != null && !nickName.trim().isEmpty()) {
-            queryWrapper.like("nick_name", nickName.trim());
+            queryWrapper.like("name", nickName.trim());
         }
 
         // 排序：优先推荐律师 -> 在线律师 -> 注册时间
@@ -466,7 +466,7 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
             resultMap.put("orderReceivingStatus", 1);
         }
 
-        if (CollectionUtils.isEmpty( list) || lawyerUser.getStatus() == 0){
+        if (CollectionUtils.isEmpty( list) && lawyerUser.getStatus() == 0){
             // 设置注销相关字段
             lawyerUser.setLogoutFlag(1); // 注销标记：1-已注销
             lawyerUser.setLogoutTime(new Date()); // 注销时间
@@ -474,6 +474,8 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
             lawyerUser.setOrderReceivingStatus(0); // 接单状态设置为不接单
             lawyerUser.setIsOnline(0); // 在线状态设置为离线
             lawyerUser.setIsRecommended(0); // 推荐状态设置为不推荐
+            lawyerUser.setIsOnline(0);
+            lawyerUser.setDeleteFlag(1);
             lawyerUser.setLastOnlineTime(new Date());
 
             // 执行更新操作