Merge branch 'master' into shibei_hlpt_master

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml

@@ -163,7 +163,9 @@
             <if test='null != endTime'>
                 AND ACTIVITY_TIME &lt;= #{endTime}
             </if>
-            AND ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime}
+            <if test='null != startTime and null != endTime'>
+                AND ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime}
+            </if>
 
     </select>
 

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java

@@ -156,8 +156,8 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 	@Override
 	public WxResult<String> getPrivacySetting(String accessToken) {
 		WxResult<String> result = new WxResult<>();
-		String url = WxMaCodeConstant.SET_PRIVACY_SETTING_URL + "?" + "access_token=" + accessToken;
-		Result<String> submitResult = HttpClientManager.getInstance().sendPostByJSON(url, "{}");
+		String url = WxMaCodeConstant.GET_PRIVACY_SETTING_URL + "?" + "access_token=" + accessToken;
+		Result<String> submitResult = HttpClientManager.getInstance().sendPostByJSON(url, "{\"privacy_ver\":2}");
 		log.info("getPrivacySetting result:{}", JSON.toJSONString(submitResult));
 		if (!submitResult.success()) {
 			result.setErrorCode(submitResult.getCode());
@@ -168,7 +168,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 
 
 		JSONArray jsonArray = jsonObject.getJSONArray(SETTING_LIST);
-		if (jsonArray.size() == 9){
+		if (jsonArray != null || jsonArray.size() == 9){
 			result.setErrorCode(9999);
 			result.setErrorMsg("用户隐私权限未设置或设置不完整");
 			return result;
@@ -181,7 +181,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 	@Override
 	public WxResult setPrivacySetting(String accessToken) {
 		//todo 目前设置9个隐私权限
-		String param = "{\"owner_setting\":{\"contact_email\":\"eshitong@elink-cn.com\",\"contact_phone\":\"\",\"contact_qq\":\"\",\"contact_weixin\":\"\",\"ext_file_media_id\":\"\",\"notice_method\":\"通知\",\"store_expire_timestamp\":\"\"},\"setting_list\":[{\"privacy_key\":\"UserInfo\",\"privacy_text\":\"用户个人中心显示用户头像及昵称等\"},{\"privacy_key\":\"Location\",\"privacy_text\":\"发表话题等功能时获取位置信息\"},{\"privacy_key\":\"Record\",\"privacy_text\":\"录音发话题等\"},{\"privacy_key\":\"Album\",\"privacy_text\":\"上传照片发话题等\"},{\"privacy_key\":\"AlbumWriteOnly\",\"privacy_text\":\"下载党建声音图片或项目附近等\"},{\"privacy_key\":\"Camera\",\"privacy_text\":\"通过相机拍照发话题反应问题等\"},{\"privacy_key\":\"PhoneNumber\",\"privacy_text\":\"通过手机号为用户开通账号，更新用户基础信息\"},{\"privacy_key\":\"MessageFile\",\"privacy_text\":\"发表话题等可以选择文件上传\"},{\"privacy_key\":\"ChooseLocation\",\"privacy_text\":\"用户巡查上报\"}],\"privacy_ver\":2}\n";
+		String param = "{\"owner_setting\":{\"contact_email\":\"eshitong@elink-cn.com\",\"contact_phone\":\"\",\"contact_qq\":\"\",\"contact_weixin\":\"\",\"ext_file_media_id\":\"\",\"notice_method\":\"通知\",\"store_expire_timestamp\":\"\"},\"setting_list\":[{\"privacy_key\":\"UserInfo\",\"privacy_text\":\"用户个人中心显示用户头像及昵称等\"},{\"privacy_key\":\"Location\",\"privacy_text\":\"发表话题等功能时获取位置信息\"},{\"privacy_key\":\"Record\",\"privacy_text\":\"录音发话题等\"},{\"privacy_key\":\"Album\",\"privacy_text\":\"上传照片发话题等\"},{\"privacy_key\":\"AlbumWriteOnly\",\"privacy_text\":\"下载党建声音图片或项目附近等\"},{\"privacy_key\":\"Camera\",\"privacy_text\":\"通过相机拍照发话题反应问题等\"},{\"privacy_key\":\"PhoneNumber\",\"privacy_text\":\"通过手机号为用户开通账号，更新用户基础信息\"},{\"privacy_key\":\"MessageFile\",\"privacy_text\":\"发表话题等可以选择文件上传\"},{\"privacy_key\":\"ChooseLocation\",\"privacy_text\":\"用户巡查上报\"}],\"privacy_ver\":2}";
 		WxResult<String> result = new WxResult<>();
 		String url = WxMaCodeConstant.SET_PRIVACY_SETTING_URL + "?" + "access_token=" + accessToken;
 		Result<String> submitResult = HttpClientManager.getInstance().sendPostByJSON(url, param);