From d863441a56c7404412de0e864ecea2d586c297bc Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Mon, 11 Mar 2024 11:27:35 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=ED=99=95?= =?UTF-8?q?=EC=9E=A5=EC=9E=90=20=EB=B3=80=EA=B2=BD(png=20->=20svg)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cokr/xit/fims/mngt/dao/FactionMapper.java | 2 +- .../WEB-INF/jsp/fims/mngt/mngt03010-main.jsp | 2 +- src/main/webapp/WEB-INF/jsp/include/top.jsp | 4 +- src/main/webapp/resources/image/no-image.png | Bin 2259 -> 0 bytes src/main/webapp/resources/image/no-image.svg | 100 ++++++++++++++++++ .../resources/image/user-circle-solid-24.png | Bin 560 -> 0 bytes .../resources/image/user-circle-solid-24.svg | 1 + .../js/fims/framework/cmm/componentization.js | 2 +- 8 files changed, 106 insertions(+), 5 deletions(-) delete mode 100644 src/main/webapp/resources/image/no-image.png create mode 100644 src/main/webapp/resources/image/no-image.svg delete mode 100644 src/main/webapp/resources/image/user-circle-solid-24.png create mode 100644 src/main/webapp/resources/image/user-circle-solid-24.svg diff --git a/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java b/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java index 82eafff9..4afadf69 100644 --- a/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java +++ b/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java @@ -103,7 +103,7 @@ public interface FactionMapper extends AbstractMapper { List sggs = selectSggs(req); - return !sggs.isEmpty() ? sggs.get(0) : null; + return (!sggs.isEmpty() || sggs.size() == 1) ? sggs.get(0) : null; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt03010-main.jsp index 0ccc738b..3443ee2b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt03010-main.jsp @@ -270,7 +270,7 @@ $(document).ready(function(){ ajax.get({ url: wctx.url("mngt/mngt03/010/getSggInfo.do"), data: { - sggID : $P.curSggCd + sggCd : $P.curSggCd }, success : function(resp, textStatus, jqXHR) { $P.sggInfo = resp.sggInfo; diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp index 797f1e61..5b273977 100644 --- a/src/main/webapp/WEB-INF/jsp/include/top.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp @@ -87,7 +87,7 @@
- " alt + " alt class="w-px-40 h-auto rounded-circle" />
${currentUser.name} @@ -101,7 +101,7 @@
- " alt + " alt class="w-px-40 h-auto rounded-circle" />
diff --git a/src/main/webapp/resources/image/no-image.png b/src/main/webapp/resources/image/no-image.png deleted file mode 100644 index b8d4f7c69373169b32acc27a181ada6a256f3158..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2259 zcmbVOX;_oT7S2WzBy1^20D+WzsNAcv8i^PQ8e+mC6+}?N8ib2b7TI@#x5#c1+^{T4 zBM24nq9~j8t5zV$(gGTk#k7e*2so(@-5>tC^UTbdIdk53&TP+_{O^t)QQu;) z1qOquvzT-bNcJcT77f)6K8=--K*b$m9mhf`9UGDd^;Kh-C*xo+wQrOK4!c%PfWfc{ zEV|?Iy^3$RINTLvq{Rdnd)21 zltiY!rp84rdd(PI|dR1=Y+~$uhkIJ3h%|iEM^qZPlapt z7fvvRx<&LeL4b!EiGPZaKk}F<+{!R*vBc|g#^_@chgVM5KcUX2;q9DP%x<4fgp1#^ zuXM%gC+Embs0~^zJ1E%lX-X5PbIEQ|C2(`O_E;dGkxXdKTpQk*S1kLpa%F#)(P~q& zM#3fj2-VnkX+0cCs!RJgAA&i?@6;lRGG=|3#=}c{m`7L3#X-cAR)SBtT)RJ}vdBAH*| zqI|aIDJc-QxBSNJHvf9ry^LB^lN^-%j#60jV24qN1p0EY#1J%Vr#3Dinh3EO(4@C$fs_1gHz
AG+D<^t97y(`SRd<1S7FhPS@CxHoj`vuL{(Z$fB+#-OfF$)fxt_+2-7$ z_8h896U>2CzAwaK2aetiE07oqX*cIt{%W1Jfs3R#_u$bnIA(=?K#oU zrKRxc#uCF7Ns!eUO;m3Iuhg&A;*vd{Z-0RHJf?T zN?GVN3rF>q)ns(5Szv{l(}LsKOD;rS7_gvdt2`|w!4+dYG=xkCE7KE^B`Z|%-PrWf zj{$ep0a_H7mdTIA92}0LdS_d}#kkIz(>Q=uqEy2=EAF{}+$dgp6s3m7n~G_~L1rR6 z3GQ$sn zMlR8Uvf7MYN3wAtREBjNdT2sJl54g(!3^!AwSU%Gw7Fd6HOaKCAKzeR4d#Bofwp+a ztA6V+6nDv!*o3Tnbh^_kh`2nuYyQJPpRv`4C1 zCKBzlO%lgz_(F)8gIR7X8M6_@J7KK5k_2%{dW(N%r)d6>PF7ehuDU(geXt{8eP+&l zYt_X5)P%}!=Y(x&Q3L2^oAx3LnI)ubfAk|7r-Gmvx}P1y+EcQpsJK;H4V>Hm?k8PR(tR98Z(^m5%VHQt1)2+tdJrO zfmMS8s)7K0YhGtAKctJcY{(F3BSmop)^;558XBv?^<6qs={rq*9Ch#*tK|dRr^WOOsN?F_ diff --git a/src/main/webapp/resources/image/no-image.svg b/src/main/webapp/resources/image/no-image.svg new file mode 100644 index 00000000..dddf484b --- /dev/null +++ b/src/main/webapp/resources/image/no-image.svg @@ -0,0 +1,100 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/resources/image/user-circle-solid-24.png b/src/main/webapp/resources/image/user-circle-solid-24.png deleted file mode 100644 index 1e0ff6cba7c18000cac5557fd1e45a949229f854..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 560 zcmV-00?+-4P)Px$>PbXFR7gv;)k~;IQ4|K??~<5cAfdd95QTwIGD0CEk1;8wkfNk8L5#gZDUX>V zQ6fo+42Y5e$|D9yl1vzQwX{!dyR+}9tGj3Wtbeb6t-b#JpC0|ZdipuPE`mW=iDj6L ziK(F1c!cY?gdep+dm~tk6PVP|Ek$*eu0H5!+N= zM;2dzd$G?uxPVm^f|2-C#Kz!V1%DV@OM|i;r7Rcyo1zuD-n}%zd2{y1rxK$FwJ}RA=P`@!5uR5-6 zD#GxZ6`js&HllcRS1keXa!*V_;;_@C8Vf~7c#@f|Y=A%tS?wBfoc9Gv_q y6c)pufEfNugdK!}t{^&SU0nnn#dnAMo!}1%?Nk|R1lLsn0000 \ No newline at end of file diff --git a/src/main/webapp/resources/js/fims/framework/cmm/componentization.js b/src/main/webapp/resources/js/fims/framework/cmm/componentization.js index d0d0bf47..f5464621 100644 --- a/src/main/webapp/resources/js/fims/framework/cmm/componentization.js +++ b/src/main/webapp/resources/js/fims/framework/cmm/componentization.js @@ -273,7 +273,7 @@ function fnMakeSingleImageViewer(imgEl, fileInputEl, dataAttributeForFilePath, d $(imgEl).attr("src", orgnPath); } else { $(imgEl).attr("alt", "파일이 없습니다."); - $(imgEl).attr("src", "/resources/image/no-image.png"); + $(imgEl).attr("src", "/resources/image/no-image.svg"); } }