From e7180a965206be1d4ca141dd68b41f50233478e2 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 21 一月 2026 11:34:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-server/src/main/java/com/estate/expert/admin/controller/admin/ScreenAccountController.java | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/controller/admin/ScreenAccountController.java b/admin-server/src/main/java/com/estate/expert/admin/controller/admin/ScreenAccountController.java
index 50bbfbb..b905922 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/controller/admin/ScreenAccountController.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/controller/admin/ScreenAccountController.java
@@ -34,7 +34,7 @@
@PostMapping("/list")
public Result list(@ApiParam(value = "账号名称") @RequestParam(value = "name", required = false) String name,
@ApiParam(value = "关键词") @RequestParam(value = "keyword", required = false) String keyword,
- @ApiParam(value = "账号类型") @RequestParam(value = "type", required = false) Integer type,
+ @ApiParam(value = "账号类型 1委托方 2项目") @RequestParam(value = "type", required = false) Integer type,
@Validated @RequestBody PageReq pageReq) {
return Result.success(screenAccountService.list(name, keyword, type,pageReq));
}
@@ -71,12 +71,6 @@
public Result edit(@Validated @RequestBody ScreenAccountEditDto dto) {
ScreenAccount screenAccount = new ScreenAccount();
BeanUtils.copyProperties(dto, screenAccount);
- if (screenAccountService.existsByAccountAndIdNot(dto.getAccount(), dto.getId())) {
- return Result.error("账号已存在");
- }
- if (dto.getPassword() != null && !dto.getPassword().isEmpty()) {
- screenAccount.setPassword(MD5Utils.encrypt(dto.getPassword()));
- }
return Result.success(screenAccountService.updateById(screenAccount));
}
--
Gitblit v1.7.1