From e649be7905be7e74f6e09d8d74a7bd7bcd3923b7 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 27 七月 2021 16:17:35 +0800
Subject: [PATCH] 修改
---
zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml | 2 +-
zhengcaioa/zhengcaioa/Views/User/JiBenGongZi.cshtml | 2 +-
zhengcaioa/zhengcaioa/Controllers/UserController.cs | 10 ++++++++++
zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml.user | 2 +-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/UserController.cs b/zhengcaioa/zhengcaioa/Controllers/UserController.cs
index 1f55740..ab973af 100644
--- a/zhengcaioa/zhengcaioa/Controllers/UserController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/UserController.cs
@@ -473,6 +473,16 @@
return View();
}
+ [CheckLogin]
+ public string GetUserListJiBenGongZi(PltUserDTOSearch search)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ search.Zhiwustatus = "A";
+ //JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
+ return JsonConvert.SerializeObject(_userService.SearchByPaging(search));
+ }
+
#region 淇敼澶囨敞
[CheckLogin]
diff --git a/zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml b/zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml
index 7540887..927cc26 100644
--- a/zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,7 +10,7 @@
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
- <PublishUrl>D:\netcoreapp3.1\publish11111\</PublishUrl>
+ <PublishUrl>D:\netcoreapp3.1\publish\</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
<TargetFramework>netcoreapp3.1</TargetFramework>
diff --git a/zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml.user b/zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml.user
index 10df99d..b9df574 100644
--- a/zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <_PublishTargetUrl>D:\netcoreapp3.1\publish11111\</_PublishTargetUrl>
+ <_PublishTargetUrl>D:\netcoreapp3.1\publish\</_PublishTargetUrl>
<History>True|2021-06-18T02:23:47.0862716Z;</History>
</PropertyGroup>
<ItemGroup>
diff --git a/zhengcaioa/zhengcaioa/Views/User/JiBenGongZi.cshtml b/zhengcaioa/zhengcaioa/Views/User/JiBenGongZi.cshtml
index 4bdda54..4a7286d 100644
--- a/zhengcaioa/zhengcaioa/Views/User/JiBenGongZi.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/User/JiBenGongZi.cshtml
@@ -89,7 +89,7 @@
return "<span style='color:" + rowObject.Coler + ";'>" + cellvalue+"</span>";
}},
];
- dataUrl = "/User/GetUserList";
+ dataUrl = "/User/GetUserListJiBenGongZi";
searchCol = [
{ label: '宸ュ彿', name: 'Usernumber', labtype: 'txt', hidden: false },
{ label: '宸ヤ綔閮ㄩ棬', name: 'DeptId', labtype: 'combox', hidden: false, data: JSON.parse(dept) },
--
Gitblit v1.9.1