java/zhihuishenqu.git

			@@ -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());
			}

			/**
			@@ -412,12 +419,13 @@
			if(count>0){
			loginUserInfoVO.setIsCheckUnitAdmin(1);
			}
			else {
			loginUserInfoVO.setIsCheckUnitAdmin(0);
			}
			Long checkUnitId=userDao.selectCheckUnitId(phone);
			if(checkUnitId!=null){
			loginUserInfoVO.setCheckUnitId(checkUnitId);
			}

			else {
			loginUserInfoVO.setIsCheckUnitAdmin(0);
			}
			//是否网格员
			int easyPhotoMember = userDao.countEasyPhotoMember(phone, userCommunityId);
			@@ -3284,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;
			}


			}