|
@@ -252,14 +252,18 @@ public class WxNoticeController extends BaseFormController{
|
|
if(StringUtils.isEmpty(openId) && StringUtils.isEmpty(userId)){
|
|
if(StringUtils.isEmpty(openId) && StringUtils.isEmpty(userId)){
|
|
return new WebPageResultDto(AppConstants.ERROR_CODE, "用户为空", null);
|
|
return new WebPageResultDto(AppConstants.ERROR_CODE, "用户为空", null);
|
|
}
|
|
}
|
|
|
|
+ int i = 0;
|
|
if (!StringUtils.isEmpty(orgId)) {
|
|
if (!StringUtils.isEmpty(orgId)) {
|
|
map.put("orgId", orgId);
|
|
map.put("orgId", orgId);
|
|
|
|
+ i = Integer.parseInt(orgId);
|
|
}
|
|
}
|
|
if (!StringUtils.isEmpty(id)) {
|
|
if (!StringUtils.isEmpty(id)) {
|
|
map.put("id", id);
|
|
map.put("id", id);
|
|
|
|
+ i = Integer.parseInt(id);
|
|
}
|
|
}
|
|
if (!StringUtils.isEmpty(userId)) {
|
|
if (!StringUtils.isEmpty(userId)) {
|
|
map.put("userId", userId);
|
|
map.put("userId", userId);
|
|
|
|
+ i = Integer.parseInt(userId);
|
|
}
|
|
}
|
|
if (!StringUtils.isEmpty(openId)) {
|
|
if (!StringUtils.isEmpty(openId)) {
|
|
map.put("openId", openId);
|
|
map.put("openId", openId);
|
|
@@ -283,7 +287,7 @@ public class WxNoticeController extends BaseFormController{
|
|
|
|
|
|
String type = request.getParameter("type");
|
|
String type = request.getParameter("type");
|
|
String id=request.getParameter("id");
|
|
String id=request.getParameter("id");
|
|
-
|
|
|
|
|
|
+ int i = Integer.parseInt(id);
|
|
log.info("WxNoticeController.getDetail-------------type:"+type+"id:"+id);
|
|
log.info("WxNoticeController.getDetail-------------type:"+type+"id:"+id);
|
|
|
|
|
|
if(type.equals("APP_NIOTICE_AUDIT")){
|
|
if(type.equals("APP_NIOTICE_AUDIT")){
|
|
@@ -1645,6 +1649,7 @@ public class WxNoticeController extends BaseFormController{
|
|
map.put("orgIds",wxUser.getOrganizationId());
|
|
map.put("orgIds",wxUser.getOrganizationId());
|
|
}
|
|
}
|
|
if(StringUtils.isNotEmpty(orgId)){
|
|
if(StringUtils.isNotEmpty(orgId)){
|
|
|
|
+ int i = Integer.parseInt(orgId);
|
|
map.put("orgIds",orgId);
|
|
map.put("orgIds",orgId);
|
|
}
|
|
}
|
|
Page page=appNoticeManager.getNewDataList(map,Integer.parseInt(pageNo),Integer.parseInt(pageSize));
|
|
Page page=appNoticeManager.getNewDataList(map,Integer.parseInt(pageNo),Integer.parseInt(pageSize));
|