From 53230dc06fc74cffccde2faf8a504ad9ee4c3be9 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Wed, 22 Oct 2025 17:47:39 +0800
Subject: [PATCH] 1

---
 SGGL/BLL/Common/CommonService.cs              |  17 +++++++----------
 .../File/Excel/DataIn/考试试题模版.xls        | Bin 20480 -> 19968 bytes
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/SGGL/BLL/Common/CommonService.cs b/SGGL/BLL/Common/CommonService.cs
index 5ba2940..753baf4 100644
--- a/SGGL/BLL/Common/CommonService.cs
+++ b/SGGL/BLL/Common/CommonService.cs
@@ -216,22 +216,19 @@ namespace BLL
                     }
                     else
                     {
+                        List<string> roleIdList = new List<string>();
                         if (string.IsNullOrEmpty(projectId))
                         {
-
-                            buttons = (from x in db.Sys_ButtonToMenu
-                                       join y in db.Sys_ButtonPower on x.ButtonToMenuId equals y.ButtonToMenuId
-                                       where y.RoleId == user.RoleId && y.MenuId == menuId && x.MenuId == menuId
-                                       select x).ToList();
+                            roleIdList = user.RoleId.Split(',').ToList();
                         }
                         else
                         {
-                            List<string> roleIdList = UserService.GetRoleListByProjectIdUserId(projectId, userId);
-                            buttons = (from x in db.Sys_ButtonToMenu
-                                       join y in db.Sys_ButtonPower on x.ButtonToMenuId equals y.ButtonToMenuId
-                                       where roleIdList.Contains(y.RoleId) && y.MenuId == menuId && x.MenuId == menuId
-                                       select x).ToList();
+                            roleIdList = UserService.GetRoleListByProjectIdUserId(projectId, userId);
                         }
+                        buttons = (from x in db.Sys_ButtonToMenu
+                                   join y in db.Sys_ButtonPower on x.ButtonToMenuId equals y.ButtonToMenuId
+                                   where roleIdList.Contains(y.RoleId) && y.MenuId == menuId && x.MenuId == menuId
+                                   select x).ToList();
                     }
                 }
 
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/考试试题模版.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/考试试题模版.xls
index 1ebef08d5d08976174d2039387bd60b41c86bcd0..344bacfdf0e208fd41fc176af693e2c660465dd7 100644
GIT binary patch
delta 1077
zcmX|=&r4KM6vxlG^XAQ)amM*+njko%R*3m4OVCN?hd)M(fuK!`ffmuK2qCfT$4n$G
zYNK8W1EGQz(W-juP#4u75Fvr>a$`YnRUq2yd*9RdhIj7$-1F`^-*fJr+6%6&@<Nu=
z@6LW^ZkK*>C-Tp>ZS}ShQHQxGZt&t|ZArTptbOd=%@?*fBWJXSVks+kwfj70-u6F<
zXlbI9v=So$KlKsQQQ4BrCv|sDbT=N)wdPt$kI3m{QlF$-shvghadNO;E~H~zlrPi0
zJT4nE12Wef;|Xt8!mQt%%Y1DTvxD-&aH05<vJ@q<2B3~ex0+ym29dz1UOsqz7~81M
z3S)f0c_L$-bFh2R_H@`xHD3xYtgQHnL(|)pE;>E4U1^q;Y*$ZvxwG7J)v$v$6aQI;
z*;3}aG8@Z2LaZ(-kWC?Kq>E?d+iYh@CGH3ieH$`=WQRD}P|ib)M)xR8e*AX&3$kzI
zIt%%Hq_4V<t?DT{)+MG<N4iS_J{8j?AAG7Dmo$*(k)Os8|InvnpYBlr1W^b33=sN6
z`&B1>5E%5FA&?T~rl>=Tx&u=E97h?h4?Um>ig+YI^&a^^I2$JlL*xX-Jn~bC;to|q
z2%^K8@SFiq(jx<u@+gS(4Imae_Ju%7Btzgh9l`o0s=5i4DSA!6=oJJAYZdD;GAvcE
zb1~4cDEX{;a5PMsbpjKnpcRv8Em;*5az0gkRn3gzi}M(l!tT0I{YHCE;XWzRRnl1F
zH6%7@4JV^|6mvZ69F$_UMWrT+Tgq0PG7^v}h|_B2@CkQ2)w+1a38vIDI-<Iu!ZQw4
zAX!PF+${DUJ4~bw#OHek?;GPiC!DnEBR9Eua`X$E_E@6`l*Oap$1{^=ODQg55T`WK
sp4v|9w(OotH`%!GnEyqC2v=hxPc+|+y5;QD2fb#*@!vOx&VADU1G?3*Z2$lO

delta 1706
zcmZ`)O-NKx6h8OPo0<3CsPpsu87Cdk(n2IP(7+sPbR3l+qG+elsz9=zg^P%KM(rXH
zuL}dAgci{v$k!r-A~&{<ur>y5tVL0~g0QA@-q9C~*L!)F@B7aEzu&!YdO=J-6f=FI
z`C0Cb5G^V!uP2)T;BTo^qHiDKR_~s?EM|?1*163WU!LdI#a=aK+?J|e{Wflj3GZ6?
zZl!8)+SFO6(*fuL0S5r8u_-0_S}i(GWEf6;tzYw&ox@e?N+ux+>SgmGbt#h)Lq3|R
zNr|F*+m!WwG_R%Qa*tX)G7#E?q&nW`Ri8O+&CJh-LD*L}#@nHLYGXXDQn~j19p}xG
zRT3b6&S9}m#YZYusK`SJY^Z|=-D)z|W@m9WEm45EoVS?k70$%TJV-F$22?;8^QVry
z`rbb&vTE#Tmut!dMge1KLF)h!2hu_s&CqCJjTX^pIH4V5m;mk$(b813HCjxgRcN$I
zjaC(CE~2d!#{==dmcT=nWjmA9Xeo{6Xte5b&Bd**DHl<z)o67ZEv?b&HCjfa?Lo~g
zUtNQyVq=;12kk~_z%Q8z7{pot%p}IhRm?&dBR?@Skdc#o=At17@!JkYup!xpt45KL
zahRFN&@x-hLPlQUn2n4k#Vm$>l0S&iqzdS=Z6;s{$P*mH^$!8rfoTXC`GA>$ED^9U
zvSh#_$Wj4|BEvUftDT9A-UaT(!r^O>2^qo3*vMFqA*v<+y~5L$7%G-!(~pF9jTqVp
z4TCQT_C<(>WE2gM86XSX?J#W=SBwRyB0!Y^stQm%Ky*vEE!_=9bR!tiJzzxcXGE6w
zk?T91Me;Wzay29JG9z*@Bl0aHGAkppXc0cZG5ChwD#*w12r_=Qam#nl$sHl}KHu4D
z`VJLnH$=vLJf0`!l1TX~o){+lYm~h9fp=o5P%ESTa_sZQ(_yc%n3Sq#B%w}>B=J4<
qU({c5GM@!2d4M|y0c_P|)T`;y^lZUU3nTLpxOD;lH(u}Ps__q{$GOY^