|
|
@ -3,6 +3,7 @@ package com.dsideal.base.DataEase.Controller;
|
|
|
|
import com.dsideal.base.Base.Model.BaseModel;
|
|
|
|
import com.dsideal.base.Base.Model.BaseModel;
|
|
|
|
import com.dsideal.base.DataEase.Model.DataEaseModel;
|
|
|
|
import com.dsideal.base.DataEase.Model.DataEaseModel;
|
|
|
|
import com.dsideal.base.Interceptor.IsLoginInterface;
|
|
|
|
import com.dsideal.base.Interceptor.IsLoginInterface;
|
|
|
|
|
|
|
|
import com.dsideal.base.Interceptor.IsNumericInterface;
|
|
|
|
import com.dsideal.base.Util.CommonUtil;
|
|
|
|
import com.dsideal.base.Util.CommonUtil;
|
|
|
|
import com.dsideal.base.Util.CookieUtil;
|
|
|
|
import com.dsideal.base.Util.CookieUtil;
|
|
|
|
import com.jfinal.aop.Before;
|
|
|
|
import com.jfinal.aop.Before;
|
|
|
@ -40,6 +41,7 @@ public class DataEaseController extends Controller {
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Before(GET.class)
|
|
|
|
@Before(GET.class)
|
|
|
|
@IsLoginInterface({})
|
|
|
|
@IsLoginInterface({})
|
|
|
|
|
|
|
|
@IsNumericInterface({"dataset_id"})
|
|
|
|
public void getDataSetTable(int dataset_id) {
|
|
|
|
public void getDataSetTable(int dataset_id) {
|
|
|
|
List<Record> list = dm.getDataSetTableContent(dataset_id);
|
|
|
|
List<Record> list = dm.getDataSetTableContent(dataset_id);
|
|
|
|
renderJson(CommonUtil.renderJsonForLayUI(list));
|
|
|
|
renderJson(CommonUtil.renderJsonForLayUI(list));
|
|
|
@ -63,7 +65,7 @@ public class DataEaseController extends Controller {
|
|
|
|
JSONArray jsonArray = JSONArray.fromObject(data);
|
|
|
|
JSONArray jsonArray = JSONArray.fromObject(data);
|
|
|
|
for (Object o : jsonArray) {
|
|
|
|
for (Object o : jsonArray) {
|
|
|
|
net.sf.json.JSONObject jo = (net.sf.json.JSONObject) o;
|
|
|
|
net.sf.json.JSONObject jo = (net.sf.json.JSONObject) o;
|
|
|
|
if (jo.containsKey("行政区划") && !jo.getString("行政区划").equals(xmqh)) {
|
|
|
|
if (identity_id>1 && jo.containsKey("行政区划") && !jo.getString("行政区划").equals(xmqh)) {
|
|
|
|
renderJson(CommonUtil.returnMessageJson(false, "数据集数据与当前登录人员所属行政区划不一致,请重新选择数据集!"));
|
|
|
|
renderJson(CommonUtil.returnMessageJson(false, "数据集数据与当前登录人员所属行政区划不一致,请重新选择数据集!"));
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|