Commit e1ac8f42 by 陶光胜

d

parent 1b4cb78e
...@@ -122,6 +122,7 @@ public class FreeQueryController { ...@@ -122,6 +122,7 @@ public class FreeQueryController {
public GeneralResult getFreeQueryCount(String sql, String enterpriseId, HttpServletRequest request, HttpServletResponse response) { public GeneralResult getFreeQueryCount(String sql, String enterpriseId, HttpServletRequest request, HttpServletResponse response) {
GeneralResult result = new GeneralResult(); GeneralResult result = new GeneralResult();
FreeQuerySource freeQuerySource = this.freeQueryService.getFreeQuerySource(SessionContextUtils.getLoginUserEnterpriseId()); FreeQuerySource freeQuerySource = this.freeQueryService.getFreeQuerySource(SessionContextUtils.getLoginUserEnterpriseId());
if(freeQuerySource != null){
Date expireTime = freeQuerySource.getDbExpiration(); Date expireTime = freeQuerySource.getDbExpiration();
Integer isPrivate = freeQuerySource.getIsPrivate(); Integer isPrivate = freeQuerySource.getIsPrivate();
if(isPrivate != null && isPrivate == 1 && expireTime != null && expireTime.before(new Date())){ if(isPrivate != null && isPrivate == 1 && expireTime != null && expireTime.before(new Date())){
...@@ -129,6 +130,9 @@ public class FreeQueryController { ...@@ -129,6 +130,9 @@ public class FreeQueryController {
}else { }else {
result.setInfo(String.valueOf(this.freeQueryService.getFreeQueryCount(sql, enterpriseId))); result.setInfo(String.valueOf(this.freeQueryService.getFreeQueryCount(sql, enterpriseId)));
} }
}else {
result.setInfo(String.valueOf(this.freeQueryService.getFreeQueryCount(sql, enterpriseId)));
}
return result; return result;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment