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

LR-20210131IOQH\Administrator

2021-06-10 56e5ef90ee97e296014b4faf6863315ad0c2ace4

 zhengcaioa/Services/ProjectService.cs

@@ -301,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))
            {