bug

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -16,12 +16,7 @@ import com.huiju.estateagents.center.taUser.service.*;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
-import com.huiju.estateagents.entity.SysButtonInMenu;
-import com.huiju.estateagents.entity.SysMenu;
-import com.huiju.estateagents.entity.TaMiniapp;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonBuilding;
-import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.TaRoleMapper;
 import com.huiju.estateagents.service.ITaMiniappService;
 import com.huiju.estateagents.service.ITaPersonBuildingService;
@@ -33,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -340,9 +336,14 @@ public class TaUserController extends BaseController {
         if (taUser == null) {
             return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-    
+
+        //校验是否过期且是否停用
+        if (LocalDateTime.now().isAfter(taUser.getExpDate())){
+            return ResponseBean.error("当前后台服务已到期，请联系相关管理人员", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
         if (!taUser.getStatus().equals(CommConstant.STATUS_NORMAL) ) {
-            return ResponseBean.error("当前后台服务已到期，请联系相关管理人员", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("该账号已经停用，请联系管理员", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());

src/main/resources/mapper/TaUserMapper.xml

@@ -64,7 +64,7 @@
             t.*,
             b.building_id,
             d.person_id as consultant_person_id,
-            if(d.person_id,1,0) as mini_status
+            if(d.person_id is not null,1,0) as mini_status
         FROM
             ta_user t
             LEFT JOIN ta_person_building b ON t.user_id = b.user_id