Browse Source

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

duhongyu 4 years ago
parent
commit
850dcd236d

+ 10 - 10
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DepartmentController.cs

11
 
11
 
12
 namespace CallCenterApi.Interface.Controllers
12
 namespace CallCenterApi.Interface.Controllers
13
 {
13
 {
14
-    
14
+    [Authority]
15
     public class DepartmentController : BaseController
15
     public class DepartmentController : BaseController
16
     {
16
     {
17
         private BLL.T_Sys_Department departmentBLL = new BLL.T_Sys_Department();
17
         private BLL.T_Sys_Department departmentBLL = new BLL.T_Sys_Department();
85
         /// 获取二级部门列表
85
         /// 获取二级部门列表
86
         /// </summary>
86
         /// </summary>
87
         /// <returns></returns>
87
         /// <returns></returns>
88
-        [Authority]
88
+        //[Authority]
89
         public ActionResult GetSecondDeptList()
89
         public ActionResult GetSecondDeptList()
90
         {
90
         {
91
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
91
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
108
         /// 获取部门列表
108
         /// 获取部门列表
109
         /// </summary>
109
         /// </summary>
110
         /// <returns></returns>
110
         /// <returns></returns>
111
-        [Authority]
111
+        //[Authority]
112
         public ActionResult GetDeptListtree(int pId = 0)
112
         public ActionResult GetDeptListtree(int pId = 0)
113
         {
113
         {
114
             DataTable dt = new DataTable();
114
             DataTable dt = new DataTable();
130
         /// <param name="tab"></param>
130
         /// <param name="tab"></param>
131
         /// <param name="parentid"></param>
131
         /// <param name="parentid"></param>
132
         /// <returns></returns>
132
         /// <returns></returns>
133
-        [Authority]
133
+        //[Authority]
134
         private List<Model.TreeModel> BindTree(DataTable tab, string parentid)
134
         private List<Model.TreeModel> BindTree(DataTable tab, string parentid)
135
         {
135
         {
136
             DataTable tab2 = new DataTable();
136
             DataTable tab2 = new DataTable();
168
         /// </summary>
168
         /// </summary>
169
         /// <param name="deptId"></param>
169
         /// <param name="deptId"></param>
170
         /// <returns></returns>
170
         /// <returns></returns>
171
-        [Authority]
171
+        //[Authority]
172
         public ActionResult GetDept()
172
         public ActionResult GetDept()
173
         {
173
         {
174
             int id = RequestString.GetInt("id", 0);
174
             int id = RequestString.GetInt("id", 0);
224
         /// </summary>
224
         /// </summary>
225
         /// <param name="input"></param>
225
         /// <param name="input"></param>
226
         /// <returns></returns>
226
         /// <returns></returns>
227
-        [Authority]
227
+        //[Authority]
228
         [HttpPost]
228
         [HttpPost]
229
         public ActionResult AddDept()
229
         public ActionResult AddDept()
230
         {
230
         {
333
                 }
333
                 }
334
             }
334
             }
335
         }
335
         }
336
-        [Authority]
336
+        //[Authority]
337
         [HttpPost]
337
         [HttpPost]
338
         public ActionResult UpdateDeptRemark()
338
         public ActionResult UpdateDeptRemark()
339
         {
339
         {
380
         /// </summary>
380
         /// </summary>
381
         /// <param name="ids"></param>
381
         /// <param name="ids"></param>
382
         /// <returns></returns>
382
         /// <returns></returns>
383
-        [Authority]
383
+        //[Authority]
384
         public ActionResult DelDept(string[] ids)
384
         public ActionResult DelDept(string[] ids)
385
         {
385
         {
386
             if (ids == null || ids.Length <= 0)
386
             if (ids == null || ids.Length <= 0)
401
         /// </summary>
401
         /// </summary>
402
         /// <param name="ids"></param>
402
         /// <param name="ids"></param>
403
         /// <returns></returns>
403
         /// <returns></returns>
404
-        [Authority]
404
+        //[Authority]
405
         public ActionResult DelDepts(int id)
405
         public ActionResult DelDepts(int id)
406
         {
406
         {
407
             if (id > 0)
407
             if (id > 0)
419
             }
419
             }
420
 
420
 
421
         }
421
         }
422
-        [Authority]
422
+        //[Authority]
423
         public bool DelDeptsByPId(int id)
423
         public bool DelDeptsByPId(int id)
424
         {
424
         {
425
             bool bl = true;
425
             bool bl = true;

+ 5 - 5
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DictionaryController.cs

12
 
12
 
13
 namespace CallCenterApi.Interface.Controllers
13
 namespace CallCenterApi.Interface.Controllers
14
 {
14
 {
15
-
15
+    [Authority]
16
     public class DictionaryController : BaseController
16
     public class DictionaryController : BaseController
17
     {
17
     {
18
         private BLL.T_Sys_DictionaryValue dictionaryValueBLL = new BLL.T_Sys_DictionaryValue();
18
         private BLL.T_Sys_DictionaryValue dictionaryValueBLL = new BLL.T_Sys_DictionaryValue();
101
 
101
 
102
         #region 字典值操作
102
         #region 字典值操作
103
 
103
 
104
-        [Authority]
104
+        //[Authority]
105
         /// <summary>
105
         /// <summary>
106
         /// 获取字典值列表
106
         /// 获取字典值列表
107
         /// </summary>
107
         /// </summary>
160
             return Content(obj.ToJson());
160
             return Content(obj.ToJson());
161
 
161
 
162
         }
162
         }
163
-        //[Authority]
163
+        ////[Authority]
164
         /// <summary>
164
         /// <summary>
165
         /// 获取字典值列表
165
         /// 获取字典值列表
166
         /// </summary>
166
         /// </summary>
256
 
256
 
257
         }
257
         }
258
 
258
 
259
-        [Authority]
259
+        //[Authority]
260
         /// <summary>
260
         /// <summary>
261
         /// 添加/编辑字典值
261
         /// 添加/编辑字典值
262
         /// </summary>
262
         /// </summary>
348
 
348
 
349
         }
349
         }
350
 
350
 
351
-        [Authority]
351
+        //[Authority]
352
         /// <summary>
352
         /// <summary>
353
         /// 删除字典值
353
         /// 删除字典值
354
         /// </summary>
354
         /// </summary>

File diff suppressed because it is too large
+ 6 - 6
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs


BIN
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Lib/Aspose.Words.dll