ios版本更新，工单导出，用户权限

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_ApplicationsVersion.cs

@@ -32,7 +32,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_VersionName", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_VersionCode", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_Files", SqlDbType.NVarChar,50),
-                    new SqlParameter("@F_Url", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_Url", SqlDbType.NVarChar,500),
                     new SqlParameter("@F_CreateUser", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
                     new SqlParameter("@F_UpdateUser", SqlDbType.NVarChar,50),
@@ -91,7 +91,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_VersionName", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_VersionCode", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_Files", SqlDbType.NVarChar,50),
-                    new SqlParameter("@F_Url", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_Url", SqlDbType.NVarChar,500),
                     new SqlParameter("@F_CreateUser", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
                     new SqlParameter("@F_UpdateUser", SqlDbType.NVarChar,50),

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/ApplicationsVersionController.cs

@@ -100,6 +100,26 @@ namespace CallCenterApi.Interface.Controllers
             }
             return NoToken("未知错误，请重新登录");
         }
+        public ActionResult GetIos()
+        {
+            var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
+            var model = new BLL.T_Sys_ApplicationsVersion().GetModelList("F_IsDelete=0 and F_Type=1 order by F_ID DESC ").FirstOrDefault();
+            if (model != null)
+            {
+                ApplicationsVersion app = new ApplicationsVersion();
+                app.F_ID = model.F_ID;
+                app.F_Type = (int)model.F_Type;
+                app.F_VersionName = model.F_VersionName;
+                app.F_VersionCode = model.F_VersionCode;
+                app.F_Files = model.F_Files;
+                app.F_Url = model.F_Url;
+                app.F_Sort = (int)model.F_Sort;
+                app.F_Remarks = model.F_Remarks;
+                app.FileUrl = GetFileData(model.F_Files, configfj.F_ParamValue);
+                return Success("成功", app);
+            }
+            return Error("获取失败");
+        }
         public ActionResult GetAndroid()
         {
             var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -150,8 +150,7 @@ namespace CallCenterApi.Interface.Controllers
 
                 if (userModel != null)
                 {
-                    if (userModel.F_RoleId == 51 || userModel.F_RoleId == 52)
-                        filter.dptid = userModel.F_DeptId;
+                    filter.dptid = userModel.F_DeptId;
                 }
                 if (filter.dptid > 0)
                 {
@@ -257,8 +256,17 @@ namespace CallCenterApi.Interface.Controllers
                 //}
                 if (userModel != null)
                 {
-                    if (userModel.F_RoleId == 51|| userModel.F_RoleId == 52)
-                        filter.dptid= userModel.F_DeptId;
+                    Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(filter.dptid);
+                    if (deptModel != null)
+                    {
+                        if (userModel.F_RoleId != 1 || userModel.F_RoleId != 4 || userModel.F_RoleId != 17
+                        || userModel.F_RoleId != 50 || userModel.F_RoleId != 67)
+                            sql += " and F_DeptId in ( select F_DeptId from T_Sys_Department where F_DeptCode like '%" + deptModel.F_DeptCode + "%') ";
+                    }
+                    else
+                    {
+                        filter.dptid = userModel.F_DeptId;
+                    }
                 }
                 if (filter.dptid > 0)
                 {
@@ -428,11 +436,20 @@ namespace CallCenterApi.Interface.Controllers
         {
             if (Request.IsAuthenticated)
             {
+                int userId = CurrentUser.UserData.F_UserId;
+                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+                if (userModel.F_RoleId ==53)
+                {
+                    return Error("无操作权限");
+                }
 
                 Model.T_Sys_UserAccount userAccountModel = new Model.T_Sys_UserAccount();
                 //员工工号不能重复
-                
-               
+                var user = new BLL.T_Sys_UserAccount().GetModelList("F_UserName='" + input.Username + "' and F_Mobile='" + input.Mobile + "'");
+                if (user.Count >0)
+                {
+                    return Error("已存在该账号!");
+                }
                 if (!string.IsNullOrEmpty(input.Usercode))
                 {
                     string ucode = input.Usercode.Trim();
@@ -465,7 +482,7 @@ namespace CallCenterApi.Interface.Controllers
                 if (input.RoleId != 0)
                 {
                     userAccountModel.F_RoleId = input.RoleId;
-                    if (input.RoleId==17|| input.RoleId == 50|| input.RoleId == 49 || input.RoleId == 65)
+                    if (input.RoleId==17|| input.RoleId == 50|| input.RoleId == 49 || input.RoleId == 65 || input.RoleId == 66 || input.RoleId == 67)
                     {
                         userAccountModel.F_See = "0";
                     }
@@ -481,10 +498,7 @@ namespace CallCenterApi.Interface.Controllers
                     {
                         userAccountModel.F_See = "3";
                     }
-                    else if (input.RoleId==66)
-                    {
-                        userAccountModel.F_See = "4";
-                    }
+                   
                 }
                     
                
@@ -558,6 +572,12 @@ namespace CallCenterApi.Interface.Controllers
         {
             if (Request.IsAuthenticated)
             {
+                int userId = CurrentUser.UserData.F_UserId;
+                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+                if (userModel.F_RoleId == 53)
+                {
+                    return Error("无操作权限");
+                }
                 BLL.T_Sys_UserAccount sysUserAccountBll = new BLL.T_Sys_UserAccount();
                 Model.T_Sys_UserAccount userAccountModel = sysUserAccountBll.GetModelList("  F_UserId = " + input.UserId).FirstOrDefault();
                 if (userAccountModel == null)
@@ -590,7 +610,7 @@ namespace CallCenterApi.Interface.Controllers
                 if (input.RoleId != 0)
                 {
                     userAccountModel.F_RoleId = input.RoleId;
-                    if (input.RoleId == 17 || input.RoleId == 50 || input.RoleId == 49 || input.RoleId == 65)
+                    if (input.RoleId == 17 || input.RoleId == 50 || input.RoleId == 49 || input.RoleId == 65|| input.RoleId == 66 || input.RoleId == 67)
                     {
                         userAccountModel.F_See = "0";
                     }
@@ -606,10 +626,7 @@ namespace CallCenterApi.Interface.Controllers
                     {
                         userAccountModel.F_See = "3";
                     }
-                    else if (input.RoleId == 66)
-                    {
-                        userAccountModel.F_See = "4";
-                    }
+                  
                 }
                    if (input.Pid!=0)
                     userAccountModel.F_PId  = input.Pid;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -311,7 +311,24 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         drNew["问题代码"] = it.F_ProblemCode;
                         drNew["质量问题"] = it.F_QualityProblem;
                         drNew["通知人"] = it.F_Notifications;
+                        if (!string.IsNullOrEmpty(it.F_Notifications))
+                        {
+                            var user = new BLL.T_Sys_UserAccount().GetModel(it.F_Notifications);
+                            if (user != null)
+                            {
+                                drNew["通知人"] = user.F_UserName;
+                            }
+
+                        }
                         drNew["接听人"] = it.F_ReceivingPerson;
+                        if (!string.IsNullOrEmpty(it.F_ReceivingPerson))
+                        {
+                            var user = new BLL.T_Sys_UserAccount().GetModel(it.F_ReceivingPerson);
+                            if (user != null)
+                            {
+                                drNew["接听人"] = user.F_UserName;
+                            }
+                        }
                         drNew["落实情况"] = it.F_ImplementationSituation;
                         var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='1' and F_ItemType=" + 11 + " and  F_WoID=" + it.F_Id  + " ").FirstOrDefault ();
                         if (itemlast!=null )
@@ -1116,10 +1133,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (deptmodel != null)
                         deptname = deptmodel.F_DeptName;
 
-                    AddLog(model.F_Id, int.Parse(model.F_State.ToString()), deptname + userModel.F_UserName + "修改工单", 0, 0, "", 0, userModel, 1);
+                 //   AddLog(model.F_Id, int.Parse(model.F_State.ToString()), deptname + userModel.F_UserName + "修改工单", 0, 0, "", 0, userModel, 1);
                     AddLog(model.F_Id, int.Parse(model.F_State.ToString()), input .F_Content, 0, 12, input .F_CallId  , 0, userModel, 1);
-                   
-                    return Success("修改成功！");
+
+                        AddLog(model.F_Id, (int)model.F_State, deptname + userModel.F_UserName + "修改重复工单", 11, 11, "", 0, userModel, 1);
+                        return Success("修改重复工单成功");
 
                 }
                 else