fix: 药店管理-新增修改校验

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaPharmacyController.java

@@ -124,6 +124,13 @@ public class WmDaPharmacyController {
 	@PostMapping
 	@PreAuthorize("@pms.hasPermission('admin_wmdapharmacy_add')")
 	public R save(@RequestBody WmDaPharmacy wmDaPharmacy) {
+		int count = wmDaPharmacyService.count(Wrappers.<WmDaPharmacy>lambdaQuery()
+				.eq(WmDaPharmacy::getPharmacyName, wmDaPharmacy.getPharmacyName()));
+
+		if (count > 0) {
+			return R.failed("药店名称已存在");
+		}
+
 		return R.ok(wmDaPharmacyService.save(wmDaPharmacy));
 	}
 
@@ -138,16 +145,14 @@ public class WmDaPharmacyController {
 	@PreAuthorize("@pms.hasPermission('admin_wmdapharmacy_edit')")
 	public R updateById(@RequestBody WmDaPharmacy wmDaPharmacy) {
 
+		int count = wmDaPharmacyService.count(Wrappers.<WmDaPharmacy>lambdaQuery()
+				.eq(WmDaPharmacy::getPharmacyName, wmDaPharmacy.getPharmacyName())
+				.ne(WmDaPharmacy::getId, wmDaPharmacy.getId()));
 
-		WmDaPharmacy query = new WmDaPharmacy();
-		query.setPharmacyName(wmDaPharmacy.getPharmacyName());
-		List<WmDaPharmacy> list = wmDaPharmacyService.list(Wrappers.query(query));
-
-		if (list.size() > 0) {
+		if (count > 0) {
 			return R.failed("药店名称已存在");
 		}
 
-
 		Integer hid = wmDaPharmacy.getUpdateUser();
 		wmDaPharmacy.setUpdateUser(0);
 		wmDaPharmacy.setDelFlag("0");
@@ -156,7 +161,7 @@ public class WmDaPharmacyController {
 		if (null != hid && 0 != hid) {
 			WmTask wmTask = wmTaskService.getById(hid);
 			if (null != wmTask) {
-				WmTaskContent wmTaskContent = wmTaskContentService.getById(wmTask.getTaskContentId());
+//				WmTaskContent wmTaskContent = wmTaskContentService.getById(wmTask.getTaskContentId());
 				wmTask.setPlatAuditStatus("1");
 				wmTaskService.updateById(wmTask);
 			}