java/zhihuishenqu.git

			@@ -476,13 +476,16 @@
			if(count>0){
			loginUserInfoVO.setIsCheckUnitAdmin(1);
			}
			else {
			loginUserInfoVO.setIsCheckUnitAdmin(0);
			}
			Long checkUnitId=userDao.selectCheckUnitId(phone);
			Long AdminUnitId=userDao.selectOrgAdminId(phone);
			if(checkUnitId!=null){
			loginUserInfoVO.setCheckUnitId(checkUnitId);
			}

			else {
			loginUserInfoVO.setIsCheckUnitAdmin(0);
			if (AdminUnitId!=null){
			loginUserInfoVO.setBindingCheckUnitId(AdminUnitId);
			}
			//是否网格员
			int easyPhotoMember = userDao.countEasyPhotoMember(phone, userCommunityId);
			@@ -3519,12 +3522,17 @@
			}

			// String resultJson = HttpClientUtil.get("https://uu-api.imashuo.com/member/wx/get-acces.s?province=" + uuLoginVO.getProvince() + "&city=" + uuLoginVO.getCity() + "&area=" + uuLoginVO.getArea() + "&appid=" + appId + "&timestamp=" + uuLoginVO.getTimestamp() + "&sign=" + uuLoginVO.getSign() + "&mobile=" + uuLoginVO.getMobile() + "&couponId=" + uuLoginVO.getCouponId(), headerMap, null);
			String resultJson = HttpClientUtil.get(str ,headerMap, null);
			String resultJson = null;
			try {
			resultJson = HttpClientUtil.getUU(str,headerMap,null);
			} catch (Exception e) {
			e.printStackTrace();
			}
			JSONObject result = JSON.parseObject(resultJson);
			if (result.get("status").equals(1)) {
			return R.ok(result.get("data")+" "+resultJson);
			return R.ok(result.get("data"));
			}
			return R.fail("信息错误"+" "+resultJson);
			return R.fail(resultJson,"信息错误");
			}

			@Override