From 0c496c28edcfc87f4431a32f76a0569c1d939d72 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 09 九月 2023 17:18:37 +0800
Subject: [PATCH] #优化
---
src/main/resources/mapper/OrderMapper.xml | 4 ++--
src/main/resources/mapper/PlanMapper.xml | 4 ++--
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 4 ++++
src/main/java/com/zy/crm/manager/controller/OrderController.java | 2 +-
src/main/java/com/zy/crm/manager/utils/CompanySearchUtils.java | 8 ++++++++
5 files changed, 17 insertions(+), 5 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 eea9d9d..b2d6320 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -115,6 +115,10 @@
if (cstmrService.selectByUuid(hostId, cstmr.getUuid()) != null) {
throw new CoolException("瀹㈡埛宸插瓨鍦�");
}
+ Cstmr cstmr1 = cstmrService.selectByName(hostId, cstmr.getName());
+ if (cstmr1!=null){
+ throw new CoolException("璇ュ鎴蜂俊鎭凡瀛樺湪锛屼笟鍔″憳鏄�:"+cstmr1.getDirector$());
+ }
cstmr.setHostId(hostId);
cstmr.setUuid(cstmrService.getUuid(hostId)); // 瀹㈡埛浠ｅ彿
cstmr.setDeptId(getDeptId()); // 鎵�灞為儴闂�
diff --git a/src/main/java/com/zy/crm/manager/controller/OrderController.java b/src/main/java/com/zy/crm/manager/controller/OrderController.java
index 4120445..96c5bb2 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -174,7 +174,7 @@
, role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
, user.getId()
, condition
- , null);
+ , 0);
List<KeyValueVo> vos = new ArrayList<>();
page.getRecords().forEach(item -> vos.add(new KeyValueVo(item.getName(), item.getId())));
return R.ok().add(vos);
diff --git a/src/main/java/com/zy/crm/manager/utils/CompanySearchUtils.java b/src/main/java/com/zy/crm/manager/utils/CompanySearchUtils.java
index e0922f4..718106d 100644
--- a/src/main/java/com/zy/crm/manager/utils/CompanySearchUtils.java
+++ b/src/main/java/com/zy/crm/manager/utils/CompanySearchUtils.java
@@ -2,6 +2,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.core.common.Cools;
+import com.core.exception.CoolException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -51,6 +53,9 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
+ if (Cools.isEmpty(jsonObject)){
+ throw new CoolException("鏃犺繑鍥炵粨鏋�");
+ }
if (Integer.parseInt(jsonObject.get("error_code").toString()) == 0) {
JSONObject result = JSON.parseObject(jsonObject.get("result").toString());
List<JSONObject> data = JSON.parseArray(result.get("data").toString(), JSONObject.class);
@@ -72,6 +77,9 @@
}
}
} catch (Exception e) {
+ if (e.getMessage().equals("鏃犺繑鍥炵粨鏋�")){
+ throw new CoolException("鏃犺繑鍥炵粨鏋�");
+ }
e.printStackTrace();
}
return list;
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index c506b2b..6cf3b53 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -58,7 +58,7 @@
WHERE 1=1
<choose>
<when test="deptId != null and deptId != ''">
- AND (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
+ AND ( (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
or
(
user_id = #{userId}
@@ -71,7 +71,7 @@
where 1=1
and user_id = #{userId}
)
- )
+ ))
</when>
<otherwise>
and
diff --git a/src/main/resources/mapper/PlanMapper.xml b/src/main/resources/mapper/PlanMapper.xml
index ea4a48d..f5e7141 100644
--- a/src/main/resources/mapper/PlanMapper.xml
+++ b/src/main/resources/mapper/PlanMapper.xml
@@ -64,7 +64,7 @@
WHERE 1=1
<choose>
<when test="deptId != null and deptId != ''">
- AND (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
+ AND ( (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
or
(
user_id = #{userId}
@@ -77,7 +77,7 @@
where 1=1
and user_id = #{userId}
)
- )
+ ))
</when>
<otherwise>
and
--
Gitblit v1.9.1