From cbc9250b33a955bc919a6afc5d4101ef65bbfafa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 12:53:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm

---
 src/main/java/com/zy/crm/manager/controller/CstmrTypeController.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 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..958d3b1 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));
@@ -59,8 +60,9 @@
     }
 
     @RequestMapping(value = "/cstmrType/add/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "娣诲姞瀹㈡埛绫诲埆")
     public R add(CstmrType cstmrType) {
+        cstmrType.setHostId(getHostId());
         cstmrType.setCreateBy(getUserId());
         cstmrType.setCreateTime(new Date());
         cstmrType.setUpdateBy(getUserId());
@@ -71,7 +73,7 @@
     }
 
 	@RequestMapping(value = "/cstmrType/update/auth")
-	@ManagerAuth
+	@ManagerAuth(memo = "鏇存柊瀹㈡埛绫诲埆")
     public R update(CstmrType cstmrType){
         if (Cools.isEmpty(cstmrType) || null==cstmrType.getId()){
             return R.error();
@@ -83,7 +85,7 @@
     }
 
     @RequestMapping(value = "/cstmrType/delete/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "鍒犻櫎瀹㈡埛绫诲埆")
     public R delete(@RequestParam(value="ids[]") Long[] ids){
          for (Long id : ids){
             cstmrTypeService.deleteById(id);

--
Gitblit v1.9.1