通讯录，账号密码

username@email.com

2021-09-28 ef80d35cdbabf2ac5fd83f84714b4254e6444fef

 zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs

@@ -1821,12 +1821,12 @@
            string[] Userids = null;
            if (!string.IsNullOrEmpty(userid) && userid!= "null")
            {
                Userids = userid.Split(','); ;
                Userids = userDTOs.Where(x=> userid.Split(',').Contains(x.Id)).OrderBy(x => x.DeptId).ThenBy(x => x.HrPosition).Select(x => x.Id).ToArray();

            }
            else
            {
                Userids = userDTOs.OrderBy(x => x.UserSn).Select(x => x.Id).ToArray();
                Userids = userDTOs.OrderBy(x => x.DeptId).ThenBy(x=>x.HrPosition).Select(x => x.Id).ToArray();
            }

            List<TongjibaobiaobaobiaoDTO> tongjibaobiaobaobiaoDTOs = new List<TongjibaobiaobaobiaoDTO>();
@@ -3505,18 +3505,20 @@
                    tongjibaobiaobaobiaoDTO.UserName = "";
                    if (deptDTO != null)
                    {
                        tongjibaobiaobaobiaoDTO.UserName += "部门：" + deptDTO.DeptName + "  ";
                        tongjibaobiaobaobiaoDTO.UserName += "部门：" + deptDTO.DeptName + "&nbsp&nbsp&nbsp&nbsp";
                    }
                    tongjibaobiaobaobiaoDTO.UserName = "姓名：" + userDTO.UserName + "  ";
                    tongjibaobiaobaobiaoDTO.UserName += "姓名：" + userDTO.UserName + "&nbsp&nbsp&nbsp&nbsp";

                    tongjibaobiaobaobiaoDTO.UserDaka = ""; 
                    if (hrPositionDTO != null)
                    {
                        tongjibaobiaobaobiaoDTO.UserName += "职务：" + hrPositionDTO.PostName + "  ";
                        tongjibaobiaobaobiaoDTO.UserDaka += "职务：" + hrPositionDTO.PostName + "&nbsp&nbsp&nbsp&nbsp";
                    }
                    if (admSignInDTO != null)
                    {
                        tongjibaobiaobaobiaoDTO.UserName += "打卡时间：上午 " + (admSignInDTO.MorningIn.HasValue? admSignInDTO.MorningIn.Value.ToString("HH:mm:ss"):"") + "-" + (admSignInDTO.MorningOut.HasValue ? admSignInDTO.MorningOut.Value.ToString("HH:mm:ss") : "")
                            + "下午 " + (admSignInDTO.AfternoonIn.HasValue ? admSignInDTO.AfternoonIn.Value.ToString("HH:mm:ss") : "") + "-" + (admSignInDTO.AfternoonOut.HasValue ? admSignInDTO.AfternoonOut.Value.ToString("HH:mm:ss") : "")
                              + "加班 " + (admSignInDTO.OvertimeIn.HasValue ? admSignInDTO.OvertimeIn.Value.ToString("HH:mm:ss") : "") + "-" + (admSignInDTO.OvertimeOut.HasValue ? admSignInDTO.OvertimeOut.Value.ToString("HH:mm:ss") : "");
                        tongjibaobiaobaobiaoDTO.UserDaka += "    打卡时间：上午 " + (admSignInDTO.MorningIn.HasValue? admSignInDTO.MorningIn.Value.ToString("HH:mm:ss"):"") + "-" + (admSignInDTO.MorningOut.HasValue ? admSignInDTO.MorningOut.Value.ToString("HH:mm:ss") : "")
                            + "&nbsp&nbsp&nbsp&nbsp下午 " + (admSignInDTO.AfternoonIn.HasValue ? admSignInDTO.AfternoonIn.Value.ToString("HH:mm:ss") : "") + "-" + (admSignInDTO.AfternoonOut.HasValue ? admSignInDTO.AfternoonOut.Value.ToString("HH:mm:ss") : "")
                              + (admSignInDTO.OvertimeIn.HasValue ? "    加班 " + admSignInDTO.OvertimeIn.Value.ToString("HH:mm:ss") + "-" : "") + (admSignInDTO.OvertimeOut.HasValue ? admSignInDTO.OvertimeOut.Value.ToString("HH:mm:ss") : "");
                    }

                    tongjibaobiaobaobiaoDTOs.Add(tongjibaobiaobaobiaoDTO);