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 | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 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 baa0d46..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;
@@ -3288,4 +3292,24 @@
}
return R.fail("信息错误");
}
+
+ @Override
+ public R checkExport(String account, String password,String oldPassword) {
+ if(new BCryptPasswordEncoder().matches(password, oldPassword)){
+ return R.ok();
+ }
+ 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