【添加】cgreport修复完毕
This commit is contained in:
+4
-4
@@ -887,7 +887,7 @@ public class b {
|
||||
String str2 = null;
|
||||
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
if (loginUser == null) {
|
||||
throw new JeecgBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
|
||||
throw new JeroBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
|
||||
}
|
||||
|
||||
|
||||
@@ -985,7 +985,7 @@ public class b {
|
||||
|
||||
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
if (loginUser == null) {
|
||||
throw new JeecgBootException("online修改表单数据异常:系统未找到当前登陆用户信息");
|
||||
throw new JeroBootException("online修改表单数据异常:系统未找到当前登陆用户信息");
|
||||
}
|
||||
|
||||
|
||||
@@ -1821,7 +1821,7 @@ public class b {
|
||||
|
||||
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
if (loginUser == null) {
|
||||
throw new JeecgBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
|
||||
throw new JeroBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
|
||||
}
|
||||
|
||||
for (OnlCgformField onlCgformField : paramList) {
|
||||
@@ -1879,7 +1879,7 @@ public class b {
|
||||
}
|
||||
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
if (loginUser == null) {
|
||||
throw new JeecgBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
|
||||
throw new JeroBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
|
||||
}
|
||||
for (OnlCgformField onlCgformField : paramList) {
|
||||
String str4 = onlCgformField.getDbFieldName();
|
||||
|
||||
+3
-3
@@ -22,7 +22,7 @@ import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.poi.ss.usermodel.Workbook;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.aspect.annotation.PermissionData;
|
||||
import com.jero.common.exception.JeecgBootException;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.api.ISysBaseAPI;
|
||||
import com.jero.common.system.vo.DictModel;
|
||||
import com.jero.common.system.vo.DynamicDataSourceModel;
|
||||
@@ -347,7 +347,7 @@ public class a {
|
||||
try {
|
||||
map = this.onlCgreportHeadService.queryCgReportConfig(paramString);
|
||||
} catch (Exception exception) {
|
||||
throw new JeecgBootException("动态报表配置不存在!");
|
||||
throw new JeroBootException("动态报表配置不存在!");
|
||||
}
|
||||
|
||||
List<Map> list = (List)map.get("items");
|
||||
@@ -532,7 +532,7 @@ public class a {
|
||||
}
|
||||
else {
|
||||
|
||||
throw new JeecgBootException("参数错误");
|
||||
throw new JeroBootException("参数错误");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+7
-7
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.exception.JeecgBootException;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.api.ISysBaseAPI;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.common.system.vo.DynamicDataSourceModel;
|
||||
@@ -122,7 +122,7 @@ public class b
|
||||
|
||||
if (ReUtil.contains(" order\\s+by ", sql.toLowerCase()) &&
|
||||
"SQLSERVER".equalsIgnoreCase(str1)) {
|
||||
throw new JeecgBootException("SqlServer不支持SQL内排序!");
|
||||
throw new JeroBootException("SqlServer不支持SQL内排序!");
|
||||
}
|
||||
|
||||
|
||||
@@ -195,7 +195,7 @@ public class b
|
||||
|
||||
if (ReUtil.contains(" order\\s+by ", sql.toLowerCase()) &&
|
||||
"3".equalsIgnoreCase(dynamicDataSourceModel.getDbType())) {
|
||||
throw new JeecgBootException("SqlServer不支持SQL内排序!");
|
||||
throw new JeroBootException("SqlServer不支持SQL内排序!");
|
||||
}
|
||||
|
||||
|
||||
@@ -382,7 +382,7 @@ public class b
|
||||
|
||||
if (ReUtil.contains(" order\\s+by ", paramString1.toLowerCase()) &&
|
||||
"3".equalsIgnoreCase(dynamicDataSourceModel.getDbType())) {
|
||||
throw new JeecgBootException("SqlServer不支持SQL内排序!");
|
||||
throw new JeroBootException("SqlServer不支持SQL内排序!");
|
||||
}
|
||||
|
||||
|
||||
@@ -398,7 +398,7 @@ public class b
|
||||
a.info("parse sql with page : " + paramString1);
|
||||
Map map = (Map)DynamicDBUtil.findOne(paramString2, paramString1, new Object[0]);
|
||||
if (map == null) {
|
||||
throw new JeecgBootException("该报表sql没有数据");
|
||||
throw new JeroBootException("该报表sql没有数据");
|
||||
}
|
||||
set = map.keySet();
|
||||
} else {
|
||||
@@ -412,14 +412,14 @@ public class b
|
||||
}
|
||||
if (ReUtil.contains(" order\\s+by ", paramString1.toLowerCase()) &&
|
||||
"SQLSERVER".equalsIgnoreCase(str)) {
|
||||
throw new JeecgBootException("SqlServer不支持SQL内排序!");
|
||||
throw new JeroBootException("SqlServer不支持SQL内排序!");
|
||||
}
|
||||
|
||||
|
||||
IPage iPage = this.mapper.selectPageBySql(new Page(1L, 1L), paramString1);
|
||||
List<Map> list = iPage.getRecords();
|
||||
if (list.size() < 1) {
|
||||
throw new JeecgBootException("该报表sql没有数据");
|
||||
throw new JeroBootException("该报表sql没有数据");
|
||||
}
|
||||
set = ((Map)list.get(0)).keySet();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user