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 |   67 ++++++++++++++++++++++++++-------
 1 files changed, 53 insertions(+), 14 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 5794e7f..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;
 
@@ -250,17 +254,20 @@
      */
     @Override
     public R updateUserWeiXinPhone(Long userId, String purePhoneNumber) {
-        SysUserDO sysUserDO = new SysUserDO();
-        sysUserDO.setPhone(purePhoneNumber);
-        sysUserDO.setUserId(userId);
-        userDao.updateMemberRole(purePhoneNumber, purePhoneNumber);
-        userDao.updateServiceTeam(purePhoneNumber, purePhoneNumber);
-        int i = userDao.updateById(sysUserDO);
-        if (i > 0) {
-            return R.ok(purePhoneNumber);
-        } else {
-            return R.fail("维护微信手机号失败");
+        SysUserDO sysUserDO=userDao.selectById(userId);
+        if(sysUserDO!=null){
+            userDao.updateMemberRole(purePhoneNumber, sysUserDO.getPhone());
+            userDao.updateServiceTeam(purePhoneNumber, sysUserDO.getPhone());
+            sysUserDO.setPhone(purePhoneNumber);
+            sysUserDO.setUserId(userId);
+            int i = userDao.updateById(sysUserDO);
+            if (i > 0) {
+                return R.ok(purePhoneNumber);
+            } else {
+                return R.fail("维护微信手机号失败");
+            }
         }
+        return R.ok(sysUserDO.getPhone());
     }
 
     /**
@@ -407,6 +414,18 @@
                     loginUserInfoVO.setIsAcidMember(2);
                 }
                 loginUserInfoVO.setRelationName(acidMember.getRelationName());
+            }
+            Integer count=userDao.selectOrgAdmin(phone);
+            if(count>0){
+                loginUserInfoVO.setIsCheckUnitAdmin(1);
+            }
+            Long checkUnitId=userDao.selectCheckUnitId(phone);
+            if(checkUnitId!=null){
+                loginUserInfoVO.setCheckUnitId(checkUnitId);
+            }
+
+            else {
+                loginUserInfoVO.setIsCheckUnitAdmin(0);
             }
             //是否网格员
             int easyPhotoMember = userDao.countEasyPhotoMember(phone, userCommunityId);
@@ -2162,9 +2181,9 @@
     @Override
     public R getSysUserVOByPhone(String phone) {
         SysUserDO sysUserDO = userDao
-            .selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone).eq(SysUserDO::getType, 1));
+            .selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone).eq(SysUserDO::getType, 1).orderByDesc(SysUserDO::getCreateAt).last("limit 1"));
         if (ObjectUtils.isEmpty(sysUserDO)) {
-            return R.fail("用户不存在");
+            return R.fail("账号或密码错误");
         }
         SysUserVO sysUserVO = new SysUserVO();
         BeanUtils.copyProperties(sysUserDO, sysUserVO);
@@ -2199,7 +2218,7 @@
         query.eq(SysUserDO::getType, type);
         SysUserDO sysUserDO = userDao.selectOne(query);
         if (ObjectUtils.isEmpty(sysUserDO)) {
-            return R.fail("用户不存在");
+            return R.fail("账号或密码错误");
         }
         SysUserVO sysUserVO = new SysUserVO();
         BeanUtils.copyProperties(sysUserDO, sysUserVO);
@@ -2972,7 +2991,7 @@
     public R getUserInfoByUnionId(String unionId) {
         SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getUnionid, unionId));
         if (isNull(sysUserDO)) {
-            return R.fail("用户不存在");
+            return R.fail("账号或密码错误");
         }
         LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
         BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
@@ -3273,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