From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index ec43bf6..4239bff 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -476,13 +476,16 @@
if(count>0){
loginUserInfoVO.setIsCheckUnitAdmin(1);
}
+ else {
+ loginUserInfoVO.setIsCheckUnitAdmin(0);
+ }
Long checkUnitId=userDao.selectCheckUnitId(phone);
+ Long AdminUnitId=userDao.selectOrgAdminId(phone);
if(checkUnitId!=null){
loginUserInfoVO.setCheckUnitId(checkUnitId);
}
-
- else {
- loginUserInfoVO.setIsCheckUnitAdmin(0);
+ if (AdminUnitId!=null){
+ loginUserInfoVO.setBindingCheckUnitId(AdminUnitId);
}
//是否网格员
int easyPhotoMember = userDao.countEasyPhotoMember(phone, userCommunityId);
@@ -2294,9 +2297,10 @@
*/
@Override
public CommunityUserInfoVO detailUserComunity(Long userId) {
- CommunityUserInfoVO communityUserInfoVO = new CommunityUserInfoVO();
+ CommunityUserInfoVO communityUserInfoVO = null;
SysUserDO sysUserDO = userDao.selectById(userId);
if (!ObjectUtils.isEmpty(sysUserDO)) {
+ communityUserInfoVO = new CommunityUserInfoVO();
String idCard = sysUserDO.getIdCard();
if (!ObjectUtils.isEmpty(idCard)) {
communityUserInfoVO.setAge(IdCard.IdNOToAge(idCard));
@@ -3525,11 +3529,11 @@
} catch (Exception e) {
e.printStackTrace();
}
-// JSONObject result = JSON.parseObject(resultJson);
-// if (result.get("status").equals(1)) {
-// return R.ok(result.get("data")+" "+resultJson);
-// }
- return R.fail("信息错误"+" "+resultJson);
+ JSONObject result = JSON.parseObject(resultJson);
+ if (result.get("status").equals(1)) {
+ return R.ok(result.get("data"));
+ }
+ return R.fail(resultJson,"信息错误");
}
@Override
--
Gitblit v1.7.1