fs-danaus
2023-09-14 31400fffd7b31397d6d8882d3927e7b870924233
src/com/yc/action/grid/GTGrid.java
@@ -4420,31 +4420,28 @@
        Page page = new Page();
        try {
            page.setTableName(json.getFunName());
            if (request.getHeader("x-app-type") != null && !"".equalsIgnoreCase(json.getFields()))
            //统一取指定的字段输出,不再区分
           /* if (request.getHeader("x-app-type") != null && !"".equalsIgnoreCase(json.getFields()))
                page.setSql(json.getFields().replaceAll(";", ","));
            else
                page.setSql("*");// 取所有
                page.setSql("*");// 取所有*/
            page.setSql(json.getFields().replaceAll(";", ","));
            page.setWhere(json.getParm());
            page.setParms(json.getFields());
            SpObserver.setDBtoInstance("_" + request.getSession().getAttribute(SessionKey.DATA_BASE_ID));
            gridService.loadAllByFunc_for(page);// 第二步,调用相对应业务类取得数据
            String data = JsonUtil.list2json(page.getData());
            if (request.getHeader("x-app-type") != null) {
                Gson gsons = new GsonBuilder().setDateFormat(
                        "yyyy-MM-dd").disableHtmlEscaping().create();
                this.print(resp, gsons.toJson(page.getData()));
            } else
                this.printJson(resp, data);// 第三步,通过Response向页面转换为json格式输出Page类数据
            Gson gsons = new GsonBuilder().setDateFormat(
                    "yyyy-MM-dd").disableHtmlEscaping().serializeNulls().create();
            this.print(resp, gsons.toJson(page.getData()));
        } catch (DataAccessException e) {
            if (request.getHeader("x-app-type") != null && "ionic".equals(request.getHeader("x-app-type"))) {
                resp.setStatus(500);
                this.printJson(resp, "{\"error\":\"" + this.getErrorMsg(e) + "\"}");
            } else
           // resp.setStatus(500);
            this.printJson(resp, "{\"error\":\"" + this.getErrorMsg(e) + "\"}");
            /*if (request.getHeader("x-app-type") != null && "ionic".equals(request.getHeader("x-app-type"))) {
            } else {
                this.printJson(resp, "error;" + this.getErrorMsg(e));
        } finally {
            gson = null;
            json = null;
            page = null;
            }*/
        }finally {
            SpObserver.setDBtoInstance();
        }