From 2f4671ea584b1df3b02f95393b75c308e35d6e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 6 Nov 2024 15:53:55 +0800 Subject: [PATCH] 'commit' --- .../412E2178-1704-4997-97C5-22A42F478ED8.xlsx | Bin 0 -> 4422 bytes .../BEF26C40-D609-4C55-8BED-79285B3611C0.xlsx | Bin 0 -> 4644 bytes .../base/DataEase/Model/DataEaseModel.java | 7 ++++++- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 WebRoot/upload/412E2178-1704-4997-97C5-22A42F478ED8.xlsx create mode 100644 WebRoot/upload/BEF26C40-D609-4C55-8BED-79285B3611C0.xlsx diff --git a/WebRoot/upload/412E2178-1704-4997-97C5-22A42F478ED8.xlsx b/WebRoot/upload/412E2178-1704-4997-97C5-22A42F478ED8.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..77e7b51c9d594ef9f29403f36dbbdf8f357badc3 GIT binary patch literal 4422 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 V8pOEl0045_OBT0GTQvAz{{cCt6}$id literal 0 HcmV?d00001 diff --git a/WebRoot/upload/BEF26C40-D609-4C55-8BED-79285B3611C0.xlsx b/WebRoot/upload/BEF26C40-D609-4C55-8BED-79285B3611C0.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..509d0703e6927a903b423440e9c64b63322519ba GIT binary patch literal 4644 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 L2B`}5e^`pzjOAETvus%m?YSuh^TGp9(!= zdg6u&tl-euequ9Ys&JoO2*=To+p093WcHy0Cq96`(EKQ3DKBED@MqHWDZpjSax_1 z|6-1{X|z;6twimyI$pA}#IH^&$N%st%=c^9;Ne4=Cpz;#xK$tWRPcr^B^1f-@eu z7d)3VR~XSX+uQw#IjA4RJi&IU;N5A>f0hhx#%P*IA5;R;SC#0`r(Z?LiGy#Ov5Rez-3LHXg@y3HfhFy5A|%1vG@J>(rO`F z0EPg^=veWjsIE}yOufj36#colTEW;rK9g9@HPw!_A&1Cak;QXVo_e7CN@dl0K^~^n zaIxAvz$7o}Diu#&uxe2Vj~ITnBy!hfK#p-Hmn)!6j_0i$V{q?eKgHJb`yqTU<#^0b zUL=e$41U<3oH@8e43`v}0lOXRtEVapE9)#T=~Oxdph%(yy}hY;dBJS`UrMp%#DWn~&P2(H3{PGD+DkmSlpHNg422_8-ShqnD4yc%8Dq$tYal1G73t zlUWu4prc|ZE>3{fflI78%is8Mo23p2(@h(dg`=I7b`*o@QJCU{Ki~k6%ULKen10sK zQLLG^Jj1y5E)}|;QEchDBhd6R#vqrrJjb~99u=A`S<5zy>a;ipLKrGAt}Q$of@N{v zc&8(PXRBIv;aGJ+D^hggg1B^q7YTgkw8M2lv`P*RgA5cZglSP#Zf+b1H$prf-f1hUNN$|) z%2{{Q5$PKvfL4&I`tTK7FktLqSmer2^O#-25@;MQz_X38d}vRySF}f4v@QtP>M#$b zwB-WWhE61VC3>_a{#s(}XbFp$1UGjkg!|DFBisbnN{bMGDxWp%il;pjKn27$HX79m ziux|X)On?b>Z*hi7?6UR9%w0i#)cmgIOc3E1B~Pb@{YvKFJMc3nx99^zhCt%Ei9>Y zd2Pp#r18!KZjq7rq`q)-Vb!CV?c^Q*iFG4(;|goF%{=UnP`MYo*W9=3{dPEseGG#- zb+Z?N=L$H8eGDlXGs$m3e_U=71^xfpKgjz(0~}XmL{<9RLJ1UdOr!qkcwG4q1>0}S zCY0Ad<=da$$6J1)I{IyHVn_)lmOH}sf0fx9B&|qE#PmXr2G}( zzYXD^uE#l+*kSxOJn+c%IHUgQe4K-bH2m9ksg9igg_Qq{b37@CjP=`C3D-zK;2-%* WA9{k&43m&h5k3lpYwADR|9=3NK$JEB literal 0 HcmV?d00001 diff --git a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java index d5f76c61..8c8aa33d 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; public class DataEaseModel { //DataEase数据库名称 public static String DB_NAME = "dataease"; + /** * 获取当前人员可以看到哪些数据集 * @@ -36,7 +37,10 @@ public class DataEaseModel { for (Record record : list) { //这个数据集,当前的区域,已经填写了多少条数据 String table_name = record.getStr("table_name"); - sql = "select count(1) as c from `" + table_name + "` where `行政区划`='" + area_name + "'"; + sql = "select count(1) as c from `" + table_name + "`"; + if (identity_id > 1) { + sql += sql + " where `行政区划`='" + area_name + "'"; + } int cnt = Db.use(DB_NAME).queryInt(sql); record.set("fill_count", cnt); } @@ -365,6 +369,7 @@ public class DataEaseModel { /** * 获取指定id的行政区划 + * * @param id * @return */