SVN r1114

SVN-Revision: r1114

插件库/Lskj.PubUserTomodule/AuditPermissionControls/StepPage1.cs

@@ -9,6 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
+using System.Data.Common;
 using System.Data.SqlClient;
 using System.Drawing;
 using System.Linq;
@@ -1024,7 +1025,7 @@ namespace Lskj.PubUserTomodule.AuditPermissionControls
 
         public void InsertStep(string stepGroup, string stepName)
         {
-            SqlTransaction myTrans = SqlHelper._connection.BeginTransaction();
+            DbTransaction myTrans = SqlHelper._connection.BeginTransaction();
             ////为事务创建一个命令
 
             try

插件库/Lskj.PubUserTomodule/FrmMain.cs

@@ -1660,13 +1660,13 @@ namespace Lskj.PubUserTomodule
                                      SELECT
                                      a.MenuId,a.SubSysId, a.MenuStruct,'01'+case when a.SubSysId>9 then cast(a.SubSysId as varchar(10)) else '0'+cast(a.SubSysId as varchar(10)) end+a.MenuStruct as speciesno,
                                      a.MenuCaption,a.MouseOutImg
-                                     ,case when a.DllFileName='Lskj.PubAccraditation.dll' then 'Lskj.PubBill.dll' when a.DllFileName='Lskj.BaseAccraditation.dll' then 'Lskj.PubModule.dll' else '' end as DllFileName
+                                     ,case when a.DllFileName in ('Lskj.PubAccraditation.dll','Lskj.PubAccraditation2.dll')  then 'Lskj.PubBill.dll' when a.DllFileName='Lskj.BaseAccraditation.dll' then 'Lskj.PubModule.dll' else '' end as DllFileName
                                      ,a.UrlParams,a.PurviewId,a.ParentMenuId,a.PurviewId as DllCode
                                      FROM P_FormMenuConfigTab a with(nolock)
                                      join P_FormMenuConfigTab aa with(nolock) on a.SubSysId=aa.SubSysId and LEFT(a.MenuStruct,2)=aa.MenuStruct
                                      where 1=1 and len(a.MenuStruct)=4 and a.useFlag=1 and aa.useFlag=1
-                                     and  a.dllfilename in ( 'Lskj.PubAccraditation.dll','Lskj.BaseAccraditation.dll')
-                                    ) a where 1=1    ";
+                                     and  a.dllfilename in ( 'Lskj.PubAccraditation.dll','Lskj.PubAccraditation2.dll','Lskj.BaseAccraditation.dll')
+                                    ) a where 1=1  ";
                 sql = sql + where;
                 DataTable dataTable = SqlHelper.ExecuteDataTable(sql);
                 this.moduleControl.gridControl.DataSource = dataTable;

插件库/Lskj.PubUserTomodule/ModuleAssociationRole.cs

@@ -1,5 +1,6 @@
 using DevExpress.XtraEditors;
 using DevExpress.XtraGrid.Columns;
+using Lskj.Business.Impl;
 using Lskj.Control;
 using Lskj.Control.Model;
 using Lskj.Core;
@@ -7,6 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
+using System.Data.SqlClient;
 using System.Drawing;
 using System.Linq;
 using System.Text;
@@ -216,7 +218,19 @@ namespace Lskj.PubUserTomodule
                     int i=SqlHelper.ExecuteNonQuery(sql);
                     if (i > 0)
                     {
-                        MessageUtil.Show("删除成功");
+                        int rValue = saveRoledata(int.Parse(RoleId));
+                        if (rValue == 0)
+                        {
+                            //在拥有权限的模块中生成权限分类 Editdate  readdate
+                           
+
+                            MessageUtil.Show("同步人员权限成功!");
+                        }
+                        else
+                        {
+                            MessageUtil.Show("同步人员权限失败!");
+                            return;
+                        }
                     }
                     else {
                         MessageUtil.Show("删除失败");
@@ -230,8 +244,4 @@ namespace Lskj.PubUserTomodule
                     MessageUtil.Show("请选择需要删除的角色");
                 }
 
-            }
-        }
-
-    }
-}
+