Merge branch 'master' of http://git.dongkesoft.com:9001/imex/dk.imex.mes

DK.Service/SystemModuleLogic/SystemModuleDAL.cs

@@ -3164,6 +3164,10 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                 //result.OperationStatus += oracleTrConn.ExecuteNonQuery(sqlString1, paras1);
                 #endregion
                 #region  增加新的数据
+
+                //2022年4月15日 13:45:57 by fy 删除[ALL]权限
+                int allFlag = 0;
+
                 // 对现有功能权限进行遍历
                 foreach (DataRow dataRow in userRightData.Tables[0].Rows)
                 {
@@ -3192,6 +3196,18 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                             };
                         result.OperationStatus += oracleTrConn.ExecuteNonQuery(sqlString2, paras2);
                     }
+                    if (dataRow["FunctionCode"].ToString() == "[ALL]") {
+                        allFlag = 1;
+                    }
+                }
+                if (allFlag < 1) {
+                    string sqlString3 = "DELETE TP_MST_UserRight WHERE UserID = :pUserID and FunctionCode=:FunctionCode";
+                    Oracle.ManagedDataAccess.Client.OracleParameter[] paras3 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
+                    {
+                        new Oracle.ManagedDataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input),
+                        new Oracle.ManagedDataAccess.Client.OracleParameter(":FunctionCode", OracleDbType.Varchar2, "[ALL]", ParameterDirection.Input)
+                    };
+                    result.OperationStatus += oracleTrConn.ExecuteNonQuery(sqlString3, paras3);
                 }
                 #endregion