xiu

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -3686,9 +3686,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 #region 办理完结向客户发送消息
                 if (model.F_State == (int)EnumWorkOrderState.finish)
                 {
-                    if (model.F_CustomerID != null)
+                    if (!string .IsNullOrEmpty (model.F_CustomerID ))
                     {
-                        var cusmodel = customerBaseBLL.GetModel(int .Parse (model.F_CustomerID.Trim ()));
+                        var cusmodel = customerBaseBLL.GetModel(model.F_CustomerID.Trim ());
                         if (cusmodel != null && !string.IsNullOrEmpty(cusmodel.F_WxOpenId))
                         {
                             sendwxmsg(model, cusmodel.F_WxOpenId, nowUser, opt);

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

@@ -1118,7 +1118,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string str = string.Empty;
             #region 查询自己名下未审批的工单列表
             var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType in(" + (int)EnumItemOpt.audit + "," + (int)EnumItemOpt.reback + "," + (int)EnumItemOpt.abreback + ")" + " and "
-                    + "F_WoState in(" + (int)EnumWorkOrderState.audit + "," + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and F_NextUser='" + ua.F_UserCode + "' "
+                    + "F_WoState in(" + (int)EnumWorkOrderState.audit + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and F_NextUser='" + ua.F_UserCode + "' "
                 + "" + " ");
 
             foreach (var it in itemlast)
@@ -1174,7 +1174,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (!string.IsNullOrEmpty(GetDeptment(ua)))
                 {
                     var itemlasts = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType in(" + (int)EnumItemOpt.audit + "," + (int)EnumItemOpt.reback + "," + (int)EnumItemOpt.abreback + ")" + " and "
-                                      + "F_WoState in(" + (int)EnumWorkOrderState.audit + "," + (int)EnumWorkOrderState.neworder + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and F_NextUser in ( " + GetDeptment(ua) + ") ");
+                                      + "F_WoState in(" + (int)EnumWorkOrderState.audit  + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and F_NextUser in ( " + GetDeptment(ua) + ") ");
                     foreach (var it in itemlasts)
                     {
                         float hours = (DateTime.Now - DateTime.Parse(it.F_CreateTime.ToString())).Hours;
@@ -5331,7 +5331,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 model.F_DealResult = "已处理";//处理结果
                 opt = "处理完结";
-                optbut = (int)EnumItemOpt.end;
+                optbut = (int)EnumItemOpt.deal;
                 wostate = (int)EnumWorkOrderState.finish;
                 model.F_DealBy = nowUser.F_UserCode;
                 model.F_DealTime = DateTime.Now;
@@ -5397,9 +5397,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 办理完结向客户发送消息
                 if (model.F_State  == (int)EnumWorkOrderState.finish)
                {
-                   if (model.F_CustomerID != null)
+                   if (!string .IsNullOrEmpty (model.F_CustomerID.Trim()) )
                    {
-                    var cusmodel = cusbll.GetModel(int .Parse (model.F_CustomerID.Trim ()));
+                      
+                    var cusmodel = cusbll.GetModel(model.F_CustomerID.Trim ());
                      if (cusmodel != null && !string.IsNullOrEmpty(cusmodel.F_WxOpenId))
                        {
                           sendwxmsg(model, cusmodel.F_WxOpenId, nowUser, opt);