修改bug

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

@@ -586,19 +586,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                         if (userModel.F_RoleCode != "GLY" && userModel.F_RoleCode != "ZXLDGLY")
                         {
-                            sql += " and F_AssignUser='" + userModel.F_UserCode + "'";
+                            sql += " and (F_AssignUser='" + userModel.F_UserCode + "' or isnull(F_AssignUser,'')='')";
                         }
                     }
                     else
                     {
-                        sql += " and (F_WorkState='1' or ( F_WorkState in (2,3,5,7,8) ";
+                        sql += " and F_WorkState in (1,2,3,5,7,8) ";
                         if (userModel.F_RoleCode != "GLY" && userModel.F_RoleCode != "ZXLDGLY")
                         {
-                            sql += " and F_AssignUser='" + userModel.F_UserCode + "'))";
-                        }
-                        else
-                        {
-                            sql += "))";
+                            sql += " and (F_AssignUser='" + userModel.F_UserCode + "' or isnull(F_AssignUser,'')='')";
                         }
                     }
                     break;
@@ -2928,6 +2924,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             dr1["name"] = lruser.F_UserName;
                             dr1["dept"] = lruser.depname;
                         }
+                        else
+                        {
+                            dr1["name"] = dt.Rows[0]["F_CreateUser"].ToString();
+                            dr1["dept"] = "";
+                        }
                     }
                     dr1["time"] = dt.Rows[0]["F_CreateTime"];
                     lcdt.Rows.Add(dr1);
@@ -2941,8 +2942,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             DataRow dr2 = lcdt.NewRow();
                             dr2["step"] = 2;
                             var jbuser = new BLL.T_Sys_UserAccount().GetModel(newjb["F_CreateUser"].ToString());
-                            dr2["name"] = jbuser.F_UserName;
-                            dr2["dept"] = jbuser.depname;
+                            if (jbuser != null)
+                            {
+                                dr2["name"] = jbuser.F_UserName;
+                                dr2["dept"] = jbuser.depname;
+                            }
+                            else
+                            {
+                                dr2["name"] = newjb["F_CreateUser"].ToString();
+                                dr2["dept"] = "";
+                            }
                             dr2["time"] = newjb["F_CreateTime"];
                             lcdt.Rows.Add(dr2);
                         }
@@ -2955,8 +2964,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             DataRow dr3 = lcdt.NewRow();
                             dr3["step"] = 3;
                             var jbuser = new BLL.T_Sys_UserAccount().GetModel(newbl["F_CreateUser"].ToString());
-                            dr3["name"] = jbuser.F_UserName;
-                            dr3["dept"] = jbuser.depname;
+                            if (jbuser != null)
+                            {
+                                dr3["name"] = jbuser.F_UserName;
+                                dr3["dept"] = jbuser.depname;
+                            }
+                            else
+                            {
+                                dr3["name"] = newbl["F_CreateUser"].ToString();
+                                dr3["dept"] = "";
+                            }
                             dr3["time"] = newbl["F_CreateTime"];
                             lcdt.Rows.Add(dr3);
                         }
@@ -2969,8 +2986,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             DataRow dr4 = lcdt.NewRow();
                             dr4["step"] = 4;
                             var jbuser = new BLL.T_Sys_UserAccount().GetModel(newhf["F_CreateUser"].ToString());
-                            dr4["name"] = jbuser.F_UserName;
-                            dr4["dept"] = jbuser.depname;
+                            if (jbuser != null)
+                            {
+                                dr4["name"] = jbuser.F_UserName;
+                                dr4["dept"] = jbuser.depname;
+                            }
+                            else
+                            {
+                                dr4["name"] = newhf["F_CreateUser"].ToString();
+                                dr4["dept"] = "";
+                            }
                             dr4["time"] = newhf["F_CreateTime"];
                             lcdt.Rows.Add(dr4);
                         }
@@ -2980,8 +3005,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         DataRow dr5 = lcdt.NewRow();
                         dr5["step"] = 5;
                         var enduser = new BLL.T_Sys_UserAccount().GetModel(dt.Rows[0]["F_CloseUser"].ToString());
-                        dr5["name"] = enduser.F_UserName;
-                        dr5["dept"] = enduser.depname;
+                        if (enduser != null)
+                        {
+                            dr5["name"] = enduser.F_UserName;
+                            dr5["dept"] = enduser.depname;
+                        }
+                        else
+                        {
+                            dr5["name"] = dt.Rows[0]["F_CloseUser"].ToString();
+                            dr5["dept"] = "";
+                        }
                         dr5["time"] = dt.Rows[0]["F_CloseTime"];
                         lcdt.Rows.Add(dr5);
                     }