From 046a62d695b32db716c0f115183fd98816160912 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 16 九月 2022 15:35:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index c28bbc8..c9ff510 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -9,6 +9,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.exception.CoolException;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.Cstmr;
import com.zy.crm.manager.service.CstmrService;
@@ -40,9 +41,24 @@
EntityWrapper<Cstmr> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
+ hostEq(wrapper);
allLike(Cstmr.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(cstmrService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("create_time", false);
+ }
+ if (!Cools.isEmpty(param.get("dept_id"))) {
+ return R.ok(cstmrService.getPage(new Page<>(curr, limit)
+ , getHostId()
+ , String.valueOf(param.get("dept_id"))
+ , condition)
+ );
+ } else {
+ if (Cools.isEmpty(param.get("user_id"))) {
+ wrapper.andNew();
+ wrapper.eq("user_id", getUserId());
+ }
+ return R.ok(cstmrService.selectPage(new Page<>(curr, limit), wrapper));
+ }
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -61,8 +77,12 @@
@RequestMapping(value = "/cstmr/add/auth")
@ManagerAuth
public R add(Cstmr cstmr) {
- cstmr.setHostId(getHostId());
- cstmr.setUuid(cstmrService.getNextUuid()); // 瀹㈡埛浠ｅ彿
+ Long hostId = getHostId();
+ if (cstmrService.selectByUuid(hostId, cstmr.getUuid()) != null) {
+ throw new CoolException("瀹㈡埛宸插瓨鍦�");
+ }
+ cstmr.setHostId(hostId);
+ cstmr.setUuid(cstmrService.getNextUuid(hostId)); // 瀹㈡埛浠ｅ彿
cstmr.setDeptId(getDeptId()); // 鎵�灞為儴闂�
cstmr.setUserId(getUserId()); // 鎵�灞炰汉鍛�
--
Gitblit v1.9.1