From 541b77a7b469854fbf0877081b3e8c378b3478a1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 31 七月 2023 16:49:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/controller/CstmrTypeController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrTypeController.java b/src/main/java/com/zy/crm/manager/controller/CstmrTypeController.java
index a20e843..9890a63 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrTypeController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrTypeController.java
@@ -40,6 +40,7 @@
EntityWrapper<CstmrType> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
+ hostEq(wrapper);
allLike(CstmrType.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(cstmrTypeService.selectPage(new Page<>(curr, limit), wrapper));
@@ -61,6 +62,7 @@
@RequestMapping(value = "/cstmrType/add/auth")
@ManagerAuth
public R add(CstmrType cstmrType) {
+ cstmrType.setHostId(getHostId());
cstmrType.setCreateBy(getUserId());
cstmrType.setCreateTime(new Date());
cstmrType.setUpdateBy(getUserId());
--
Gitblit v1.9.1