Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

username@email.com

2021-06-21 0f5218bb8ed4ad8fa9b8b2f089efd624dc6e9f07

 zhengcaioa/Services/ProjectService.cs

@@ -27,6 +27,16 @@
            ResultEntity resultEntity = new ResultEntity();
            try
            {
                var checkUserSn = _context.Projects.Where(x => x.Name == projectDTO.Name && x.RecStatus == "A" && x.Id != projectDTO.Id).FirstOrDefault();
                if (checkUserSn != null && (string.IsNullOrWhiteSpace(projectDTO.Id) || (!string.IsNullOrWhiteSpace(projectDTO.Id) && checkUserSn.Id != projectDTO.Id)))
                {
                    resultEntity.Result = false;
                    resultEntity.Message = "项目重复";
                    return resultEntity;
                }



                var project = _mapper.Map<Project>(projectDTO);
                // var ZhuanjiaList = projectDTO.ZhuanjiaList;
                //if(ZhuanjiaList!=null&& ZhuanjiaList.Length > 0)
@@ -291,6 +301,20 @@
                sql.Append(" )");

            }
            
                  if (!string.IsNullOrWhiteSpace(searchEntity.fblx))
            {
                if (searchEntity.fblx == "A")
                {
                    sql.Append(" and a.fblx  is   not null ");
                }
                else
                {
                    sql.Append(" and a.fblx  is  null ");
                }
               

            }

            if (!string.IsNullOrWhiteSpace(searchEntity.StartTimestar))
            {