diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionOneselfController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionOneselfController.java index 8e93edf73..2526acc2b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionOneselfController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionOneselfController.java @@ -101,7 +101,7 @@ public class WxQuestionOneselfController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } if(!record.getStatus().equals(EnumQuestionOneselfStatus.STATUS_TAKE_OFFF.getCode()) - || !record.getStatus().equals(EnumQuestionOneselfStatus.INJECT_ONLINE.getCode())) { + && !record.getStatus().equals(EnumQuestionOneselfStatus.INJECT_ONLINE.getCode())) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } return wxQuestionOneselfService.updateStatus(record); diff --git a/mallinkService/src/main/java/com/iformall/service/ExcelService.java b/mallinkService/src/main/java/com/iformall/service/ExcelService.java index d20b3b590..908af060c 100644 --- a/mallinkService/src/main/java/com/iformall/service/ExcelService.java +++ b/mallinkService/src/main/java/com/iformall/service/ExcelService.java @@ -40,9 +40,6 @@ public class ExcelService { defaultExport(headList, dataList, fileName, response, exportParams, false); } - public static void main(String[] args) { - - } public void exportExcel(List list, String title, String sheetName, Class pojoClass, String fileName, boolean isCreateHeader, HttpServletResponse response) {