username@email.com
2021-12-21 65e60c2c3c2eb2c175cf7d2a08295d08c585f626
zhengcaioa/Services/SysCodeService.cs
@@ -402,13 +402,18 @@
                             (string.IsNullOrWhiteSpace(searchEntity.Comments) ? true : a.Comments.Contains(searchEntity.Comments)) &&
                             (string.IsNullOrWhiteSpace(searchEntity.CodeSn) ? true : a.CodeSn.Contains(searchEntity.CodeSn)) &&
                             (string.IsNullOrWhiteSpace(searchEntity.Contents) ? true : a.Contents.Contains(searchEntity.Contents)) &&
                             (string.IsNullOrWhiteSpace(searchEntity.WentiId) ? true : a.Contents == searchEntity.WentiId)
                             (string.IsNullOrWhiteSpace(searchEntity.WentiId) ? true : a.Contents == searchEntity.WentiId) &&
                             (string.IsNullOrWhiteSpace(searchEntity.Classify1) ? true : a.Classify1.Contains(searchEntity.Classify1))
                            select a
                             ).OrderBy(x=>x.Sort).ToList();
            if (!string.IsNullOrEmpty(searchEntity.Sort))
            {
                listCode = listCode.OrderBy(x => x.CodeSn).ToList();
            }
            else if (!string.IsNullOrEmpty(searchEntity.Sort1))
            {
                listCode = listCode.OrderBy(x => x.Classify1).ThenBy(x=>x.CodeSn).ToList();
            }
            //if (searchEntity.totalrows == 0)
@@ -433,7 +438,7 @@
                        Comments = l.Comments,
                        Contents = l.Contents,
                        Sort = l.Sort,
                        Classify1 = l.Classify1,
                        Creater = l.Creater,
                        Createtime = l.Createtime,
                        RecStatus = l.RecStatus,
@@ -473,6 +478,7 @@
                alldtl.Createtime = model.Createtime;
                alldtl.Modifier = model.Modifier;
                alldtl.Modifytime = model.Modifytime;
                alldtl.Classify1 = model.Classify1;
                alldtl.CreatetimeStr = model.Createtime.ToString();
                alldtl.RecStatusName = model.RecStatus.ToString().Equals("A") ? "启用" : "停用";
            }
@@ -533,6 +539,7 @@
                        mModel.Contents = Entity.Contents + "";
                        mModel.Sort = Entity.Sort;
                        mModel.RecStatus = "A";
                        mModel.Classify1 = Entity.Classify1;
                        mModel.Modifier = Entity.Modifier;
                        mModel.Modifytime = Entity.Modifytime;
@@ -561,7 +568,8 @@
                                Creater = Entity.Modifier,
                                Createtime = Entity.Modifytime,
                                Modifier = Entity.Modifier,
                                Modifytime = Entity.Modifytime
                                Modifytime = Entity.Modifytime,
                                Classify1 = Entity.Classify1,
                            });