Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2024-06-02 cebf0cafac47189c48f49ad9dd13cb5894341b4f

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java

@@ -146,7 +146,7 @@
        po.setOperateDt(operateTime);
        po.setDeleted((byte) 0);
        po.setFindDt(operateTime);
        if (po.getAddWays() != (byte) 2) {
        if (po.getAddWays() == null) {
            po.setAddWays((byte) 1);
        }
        Integer rec = Optional.ofNullable(controllerSv.addController(po)).orElse(0);
@@ -244,4 +244,6 @@
        String fileName = URLEncoder.encode(rawFileName, "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
    }


}