Merge branch 'master' of http://192.168.1.222:3000/duhongyu/Anyang_api

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DepartmentController.cs

@@ -11,7 +11,7 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers
 {
-    
+    [Authority]
     public class DepartmentController : BaseController
     {
         private BLL.T_Sys_Department departmentBLL = new BLL.T_Sys_Department();
@@ -85,7 +85,7 @@ namespace CallCenterApi.Interface.Controllers
         /// 获取二级部门列表
         /// </summary>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult GetSecondDeptList()
         {
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
@@ -108,7 +108,7 @@ namespace CallCenterApi.Interface.Controllers
         /// 获取部门列表
         /// </summary>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult GetDeptListtree(int pId = 0)
         {
             DataTable dt = new DataTable();
@@ -130,7 +130,7 @@ namespace CallCenterApi.Interface.Controllers
         /// <param name="tab"></param>
         /// <param name="parentid"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         private List<Model.TreeModel> BindTree(DataTable tab, string parentid)
         {
             DataTable tab2 = new DataTable();
@@ -168,7 +168,7 @@ namespace CallCenterApi.Interface.Controllers
         /// </summary>
         /// <param name="deptId"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult GetDept()
         {
             int id = RequestString.GetInt("id", 0);
@@ -224,7 +224,7 @@ namespace CallCenterApi.Interface.Controllers
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         [HttpPost]
         public ActionResult AddDept()
         {
@@ -333,7 +333,7 @@ namespace CallCenterApi.Interface.Controllers
                 }
             }
         }
-        [Authority]
+        //[Authority]
         [HttpPost]
         public ActionResult UpdateDeptRemark()
         {
@@ -380,7 +380,7 @@ namespace CallCenterApi.Interface.Controllers
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult DelDept(string[] ids)
         {
             if (ids == null || ids.Length <= 0)
@@ -401,7 +401,7 @@ namespace CallCenterApi.Interface.Controllers
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult DelDepts(int id)
         {
             if (id > 0)
@@ -419,7 +419,7 @@ namespace CallCenterApi.Interface.Controllers
             }
 
         }
-        [Authority]
+        //[Authority]
         public bool DelDeptsByPId(int id)
         {
             bool bl = true;

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DictionaryController.cs

@@ -12,7 +12,7 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers
 {
-
+    [Authority]
     public class DictionaryController : BaseController
     {
         private BLL.T_Sys_DictionaryValue dictionaryValueBLL = new BLL.T_Sys_DictionaryValue();
@@ -101,7 +101,7 @@ namespace CallCenterApi.Interface.Controllers
 
         #region 字典值操作
 
-        [Authority]
+        //[Authority]
         /// <summary>
         /// 获取字典值列表
         /// </summary>
@@ -160,7 +160,7 @@ namespace CallCenterApi.Interface.Controllers
             return Content(obj.ToJson());
 
         }
-        //[Authority]
+        ////[Authority]
         /// <summary>
         /// 获取字典值列表
         /// </summary>
@@ -256,7 +256,7 @@ namespace CallCenterApi.Interface.Controllers
 
         }
 
-        [Authority]
+        //[Authority]
         /// <summary>
         /// 添加/编辑字典值
         /// </summary>
@@ -348,7 +348,7 @@ namespace CallCenterApi.Interface.Controllers
 
         }
 
-        [Authority]
+        //[Authority]
         /// <summary>
         /// 删除字典值
         /// </summary>