From e43fd10c1a51be5809c361c24a2be138837b02b2 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 07 七月 2022 09:33:35 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 bec9222..4610cef 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
@@ -146,6 +146,10 @@
private SysAppConfigDao sysAppConfigDao;
@Resource
private SysTemplateConfigDao sysTemplateConfigDao;
+ public static final Integer ALLCOUNTY=1;
+ public static final Integer ALLSTREET=2;
+ public static final Integer ALLCOMMUNITY=3;
+
// @Resource
// private GridService gridService;
@@ -422,10 +426,6 @@
else {
loginUserInfoVO.setIsCheckUnitAdmin(0);
- }
- Long checkUnitId=userDao.selectCheckUnitId(phone);
- if(checkUnitId!=null){
- loginUserInfoVO.setCheckUnitId(checkUnitId);
}
//是否网格员
int easyPhotoMember = userDao.countEasyPhotoMember(phone, userCommunityId);
@@ -3300,4 +3300,16 @@
}
return R.fail();
}
+
+ @Override
+ public R newIndexData(Integer type, Long streetId) {
+ IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(null);
+ //判断数据范围
+ if (type.equals(ALLCOUNTY)){
+ //数据范围：全部区县
+ }
+ return null;
+ }
+
+
}
--
Gitblit v1.7.1