Merge branch 'release/a2cfa70a'

JunmpPoliceStation/Controllers/PolicemanController.cs

@@ -593,6 +593,10 @@ namespace JunmpPoliceStation.Controllers
                         {
                             return JsonManager.SimpleCustResponse($"PoliceCode is require");
                         }
+                        else if (entity.policeCode.Length > 9)
+                        {
+                            return JsonManager.SimpleCustResponse($"PoliceCode長度不能超過9位");
+                        }
                         else if (string.IsNullOrEmpty(entity.orgizationCode ?? ""))
                         {
                             return JsonManager.SimpleCustResponse($"OrgizationCode is require");

JunmpPoliceStation/Controllers/TjController.cs

@@ -633,7 +633,8 @@ namespace JunmpPoliceStation.Controllers
                         string equipmentSizecode = entity.equipmentSizecode;
 
                         var idList = OrgTreeModel.GetOrgIdList(orgModelList, org.Id);
-                        expressionPoliceman = t => idList.Contains(t.OrgId);
+                        //expressionPoliceman = t => idList.Contains(t.OrgId);
+                        expressionPoliceman = t => t.OrgId== org.Id;
 
                         if (!String.IsNullOrEmpty(typeId))
                         {
@@ -1480,10 +1481,6 @@ namespace JunmpPoliceStation.Controllers
                             size = 10;
                         }
 
-                        Expression<Func<BaseJpOrganization, bool>> expression = t => t.State == 1;
-
-                        ListEq = _unitOfWork.OrganizationRepository.GetList(expression, t => t.Code).ToList();
-
                         string orgizationCode = Guid.Empty.ToString();
                         List<BaseJpOrganization> dataList = null;
 
@@ -1506,10 +1503,31 @@ namespace JunmpPoliceStation.Controllers
                         }
                         else
                         {
-                            dataList = GetClassID(orgizationCode);
-                            dataList = dataList.ToList().Concat(ListEq.Where(c => c.Id.Equals(orgizationCode))).ToList();
-                            List<string> IdList = dataList.Select(c => c.Id).ToList();
-                            expressionPoliceman = t => IdList.Contains(t.OrgId) && t.CurrentState != 5 && t.CurrentState != 6;
+                            var orgModelList = new List<OrgTreeModel>();
+                            if (MemoryCacheHelper.Exists("orgModelList"))
+                            {
+                                orgModelList = (List<OrgTreeModel>)MemoryCacheHelper.Get("orgModelList");
+                            }
+                            else
+                            {
+                                orgModelList = _unitOfWork.OrganizationRepository
+                                    .Entities
+                                    .Select(x => new OrgTreeModel
+                                    {
+                                        Id = x.Id,
+                                        State = x.State == 1,
+                                        Name = x.Name,
+                                        Code = x.Code,
+                                        ParentId = x.ParentId
+                                    })
+                                    .ToList();
+
+                                //默认过期时间1天
+                                MemoryCacheHelper.AddMemoryCache("orgModelList", orgModelList, 1440);
+                            }
+                            var idList = OrgTreeModel.GetOrgIdList(orgModelList, orgizationCode);
+                            
+                            expressionPoliceman = t => idList.Contains(t.OrgId) && t.CurrentState != 5 && t.CurrentState != 6;
                         }
 
 
@@ -1613,10 +1631,6 @@ namespace JunmpPoliceStation.Controllers
 
                         var entity = JsonManager.GetJsonEntity(jdata);
 
-                        Expression<Func<BaseJpOrganization, bool>> expression = t => t.State == 1;
-
-                        ListEq = _unitOfWork.OrganizationRepository.GetList(expression, t => t.Code).ToList();
-
                         string orgizationCode = Guid.Empty.ToString();
                         List<BaseJpOrganization> dataList = null;
 
@@ -1639,10 +1653,30 @@ namespace JunmpPoliceStation.Controllers
                         }
                         else
                         {
-                            dataList = GetClassID(orgizationCode);
-                            dataList = dataList.ToList().Concat(ListEq.Where(c => c.Id.Equals(orgizationCode))).ToList();
-                            List<string> IdList = dataList.Select(c => c.Id).ToList();
-                            expressionPoliceman = t => IdList.Contains(t.OrgId) || t.CurrentState == null;
+                            var orgModelList = new List<OrgTreeModel>();
+                            if (MemoryCacheHelper.Exists("orgModelList"))
+                            {
+                                orgModelList = (List<OrgTreeModel>)MemoryCacheHelper.Get("orgModelList");
+                            }
+                            else
+                            {
+                                orgModelList = _unitOfWork.OrganizationRepository
+                                    .Entities
+                                    .Select(x => new OrgTreeModel
+                                    {
+                                        Id = x.Id,
+                                        State = x.State == 1,
+                                        Name = x.Name,
+                                        Code = x.Code,
+                                        ParentId = x.ParentId
+                                    })
+                                    .ToList();
+
+                                //默认过期时间1天
+                                MemoryCacheHelper.AddMemoryCache("orgModelList", orgModelList, 1440);
+                            }
+                            var idList = OrgTreeModel.GetOrgIdList(orgModelList, orgizationCode);
+                            expressionPoliceman = t => idList.Contains(t.OrgId) || t.CurrentState == null;
                         }
 
 

JunmpPoliceStation/Controllers/ViewController.cs

@@ -541,7 +541,7 @@ namespace JunmpPoliceStation.Controllers
                         "WarehouseCodeNavigation"
                     };
 
-                        Expression<Func<CommonJpEquipmentInventory, bool>> expression = t => t.WarehouseCodeNavigation.OrgizationId.Equals(orgId);
+                        Expression<Func<CommonJpEquipmentInventory, bool>> expression = t => t.OrgId.Equals(orgId);
 
                         IQueryable<CommonJpEquipmentInventory> inventoryList = _unitOfWork.EquipmentInventoryRepository.GetList(expression, t => t.WarehouseCode, false, param);