fix 处理特殊任务
This commit is contained in:
@@ -280,7 +280,7 @@ public class AssignmentService : IAssignmentService
|
|||||||
Brand = deviceTemplate.Brand,
|
Brand = deviceTemplate.Brand,
|
||||||
FuncStr = device.Funcs.ToString(),
|
FuncStr = device.Funcs.ToString(),
|
||||||
UserNo = deviceTask.UserNo,
|
UserNo = deviceTask.UserNo,
|
||||||
UserCode = SqlFunc.IsNull(ga.Code, gaLeave.Code),
|
UserCode = SqlFunc.IsNull(SqlFunc.IsNull(ga.Code, gaLeave.Code), deviceTask.UserNo),
|
||||||
UserName = SqlFunc.IsNull(ga.Name, gaLeave.Name),
|
UserName = SqlFunc.IsNull(ga.Name, gaLeave.Name),
|
||||||
DepartmentNo = ga.DepartmentNo,
|
DepartmentNo = ga.DepartmentNo,
|
||||||
DepartmentName = department.Name,
|
DepartmentName = department.Name,
|
||||||
|
|||||||
Reference in New Issue
Block a user