SVN r966

SVN-Revision: r966
2025-09-05 08:13:50 +00:00
parent 4094450dcf
commit 9d437b99c0
3 changed files with 7 additions and 4 deletions
@@ -482,6 +482,8 @@ namespace Lskj.Business.Impl
                sumCond += ",a.enableCond";
            if (HasExistsColumn("p_systembillDetail", "labelText"))
                sumCond += ",a.labelText";
+            if (HasExistsColumn("p_systembillDetail", "disableCond"))
+                sumCond += ",a.disableCond";

            if (HasExistsColumn("p_systembillDetail", "canCopy"))
                sumCond += ",a.canCopy";
@@ -636,7 +638,7 @@ namespace Lskj.Business.Impl
                                                SELECT  r.roleName
                                                FROM p_systemRoleOperSetTab AS ro
 			                                    JOIN p_systemRoleSetTab AS r ON r.id = ro.roleId
-			                                    WHERE ro.operatorname = '{0}'
+			                                    WHERE ro.operatorname = '{1}'
 			                                    )
                                                 SELECT id,sourceId,fieldName,sysName,userName,orderid,isVisible,sourceKey,privilegeView,DataFormat,isSum,ifmerge,{2}
                                                 isnull(CASE WHEN isVisible=1 OR (ISNULL(b.userList,'')='' AND ISNULL(a.PrivilegeView,'')<>'') THEN 0 ELSE width END,0) width