diff --git a/asg_form/Controllers/Teamregistration/RegisterController.cs b/asg_form/Controllers/Teamregistration/RegisterController.cs
index ba0bb39..bab0d25 100644
--- a/asg_form/Controllers/Teamregistration/RegisterController.cs
+++ b/asg_form/Controllers/Teamregistration/RegisterController.cs
@@ -31,6 +31,7 @@ namespace asg_form.Controllers.Teamregistration
public string status { get; set; }
public string biz_type { get; set; }
public string req_role { get; set; }
+ public string intro_url { get; set; }
}
public class userMsg
{
@@ -45,6 +46,7 @@ namespace asg_form.Controllers.Teamregistration
public int? id { get; set; }
public string bizType { get; set; }
public string reqRole { get; set; }
+ public string introUrl { get; set; }
}
public class RegisterController : ControllerBase
{
@@ -91,6 +93,7 @@ namespace asg_form.Controllers.Teamregistration
approval_time = "未审核",
biz_type = msg.bizType,
req_role = msg.reqRole,
+ intro_url = msg.introUrl,
};
sub.T_Comform.Add(rgst);
await sub.SaveChangesAsync();
@@ -127,6 +130,7 @@ namespace asg_form.Controllers.Teamregistration
query.status = "1";
query.biz_type = msg.bizType;
query.req_role = msg.reqRole;
+ query.intro_url = msg.introUrl;
await sub.SaveChangesAsync();
string mesg = $"[ASG管理系统]有新解说申请,请及时上后台系统审批。";
string qqgroup = "925510646";
@@ -268,9 +272,10 @@ namespace asg_form.Controllers.Teamregistration
{
var query = testDb.T_Comform.FirstOrDefault(c => c.user_id == userId);
var user = await userManager.Users.FirstOrDefaultAsync(u => u.Id == userId);
- if (query == null ) return Ok(new { code = 404, message = "用户1未找到" });
- if (user == null) return Ok(new { code = 404, message = "用户2未找到" });
- query.status = "4";
+
+ if (user == null) return Ok(new { code = 404, message = "用户未找到" });
+ if (query != null) {query.status = "4"; }
+
user.officium = null;
await testDb.SaveChangesAsync();
await userManager.UpdateAsync(user);
diff --git a/asg_form/Controllers/admin.cs b/asg_form/Controllers/admin.cs
index 7227137..677d5f2 100644
--- a/asg_form/Controllers/admin.cs
+++ b/asg_form/Controllers/admin.cs
@@ -305,12 +305,12 @@ namespace asg_form.Controllers
/// 搜索关键字
/// 页码,默认为1
/// 每页大小,默认为10
-/// 部门筛选条件
+/// 部门筛选条件
/// 返回分页后的用户列表及总数
[Route("api/v2/admin/allperson")]
[HttpGet]
[Authorize]
-public async Task> GetAdminUsersV2(string? keyword = null, short pageindex = 1, short pagesize = 10, string? officum = null)
+public async Task> GetAdminUsersV2(string? keyword = null, short pageindex = 1, short pagesize = 10, string? officium = null)
{
// 检查用户是否有管理员权限
if (!this.User.HasClaim(ClaimTypes.Role, "admin"))
@@ -326,9 +326,9 @@ public async Task> GetAdminUsersV2(string? keyword = nu
query = query.Where(u => u.chinaname.Contains(keyword) || u.UserName == keyword || u.Email == keyword);
}
- if (!string.IsNullOrEmpty(officum))
+ if (!string.IsNullOrEmpty(officium))
{
- query = query.Where(u => u.officium == officum);
+ query = query.Where(u => u.officium == officium);
}
// 获取总记录数