傅行帆 5 yıl önce
ebeveyn
işleme
d4ef602deb

+ 9
- 8
src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java Dosyayı Görüntüle

@@ -16,12 +16,7 @@ import com.huiju.estateagents.center.taUser.service.*;
16 16
 import com.huiju.estateagents.common.CommConstant;
17 17
 import com.huiju.estateagents.common.JWTUtils;
18 18
 import com.huiju.estateagents.common.MD5Utils;
19
-import com.huiju.estateagents.entity.SysButtonInMenu;
20
-import com.huiju.estateagents.entity.SysMenu;
21
-import com.huiju.estateagents.entity.TaMiniapp;
22
-import com.huiju.estateagents.entity.TaPerson;
23
-import com.huiju.estateagents.entity.TaPersonBuilding;
24
-import com.huiju.estateagents.entity.TaRole;
19
+import com.huiju.estateagents.entity.*;
25 20
 import com.huiju.estateagents.mapper.TaRoleMapper;
26 21
 import com.huiju.estateagents.service.ITaMiniappService;
27 22
 import com.huiju.estateagents.service.ITaPersonBuildingService;
@@ -33,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
33 28
 import org.springframework.web.bind.annotation.*;
34 29
 
35 30
 import javax.servlet.http.HttpServletRequest;
31
+import java.time.LocalDateTime;
36 32
 import java.util.ArrayList;
37 33
 import java.util.HashMap;
38 34
 import java.util.List;
@@ -340,9 +336,14 @@ public class TaUserController extends BaseController {
340 336
         if (taUser == null) {
341 337
             return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
342 338
         }
343
-    
339
+
340
+        //校验是否过期且是否停用
341
+        if (LocalDateTime.now().isAfter(taUser.getExpDate())){
342
+            return ResponseBean.error("当前后台服务已到期,请联系相关管理人员", ResponseBean.ERROR_ILLEGAL_PARAMS);
343
+        }
344
+
344 345
         if (!taUser.getStatus().equals(CommConstant.STATUS_NORMAL) ) {
345
-            return ResponseBean.error("当前后台服务已到期,请联系相关管理人员", ResponseBean.ERROR_UNAVAILABLE);
346
+            return ResponseBean.error("该账号已经停用,请联系管理员", ResponseBean.ERROR_UNAVAILABLE);
346 347
         }
347 348
 
348 349
         List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());

+ 1
- 1
src/main/resources/mapper/TaUserMapper.xml Dosyayı Görüntüle

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