java/zhihuishenqu.git

			@@ -408,6 +408,13 @@
			}
			loginUserInfoVO.setRelationName(acidMember.getRelationName());
			}
			Integer count=userDao.selectOrgAdmin(phone);
			if(count>0){
			loginUserInfoVO.setIsCheckUnitAdmin(1);
			}
			else {
			loginUserInfoVO.setIsCheckUnitAdmin(0);
			}
			//是否网格员
			int easyPhotoMember = userDao.countEasyPhotoMember(phone, userCommunityId);
			if (easyPhotoMember > 0) {
			@@ -2164,7 +2171,7 @@
			SysUserDO sysUserDO = userDao
			.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone).eq(SysUserDO::getType, 1));
			if (ObjectUtils.isEmpty(sysUserDO)) {
			return R.fail("用户不存在");
			return R.fail("账号或密码错误");
			}
			SysUserVO sysUserVO = new SysUserVO();
			BeanUtils.copyProperties(sysUserDO, sysUserVO);
			@@ -2199,7 +2206,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 +2979,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);
			@@ -3266,9 +3273,7 @@
			}
			Map<String, String> headerMap=new HashMap<>();
			headerMap.put("appid","10000");
			String url="https://api.uucsh.cn/member/wx/get-access?province="+uuLoginVO.getProvince()+"&city="+uuLoginVO.getCity()+"&area="+uuLoginVO.getArea()+"&appid=10000&timestamp="+uuLoginVO.getTimestamp()+"&sign="+uuLoginVO.getSign()+"&mobile="+uuLoginVO.getMobile();
			String resultJson=HttpClientUtil.get("https://api.uucsh.cn/member/wx/get-access?province="+uuLoginVO.getProvince()+"&city="+uuLoginVO.getCity()+"&area="+uuLoginVO.getArea()+"&appid=10000&timestamp="+uuLoginVO.getTimestamp()+"&sign="+uuLoginVO.getSign()+"&mobile="+uuLoginVO.getMobile(),headerMap,null);
			//String resultJson=HttpClientUtil.sendPostByJson("https://api.uucsh.cn/member/wx/get-access", JSON.toJSONString(uuLoginVO),10,"appid",uuLoginVO.getAppid());
			JSONObject result = JSON.parseObject(resultJson);
			if(result.get("status").equals(1)){
			return R.ok(result.get("data"));