From e53f3c7239749294f5c61245651235a02fb3e41b Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 26 七月 2023 14:33:42 +0800
Subject: [PATCH] #甲方单位页面优化
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 6 +++---
src/main/webapp/views/cstmr/cstmr.html | 7 +++++--
src/main/java/com/zy/crm/manager/service/CstmrFollService.java | 2 +-
src/main/java/com/zy/crm/manager/service/impl/CstmrFollServiceImpl.java | 2 +-
src/main/java/com/zy/crm/manager/mapper/CstmrFollMapper.java | 2 +-
5 files changed, 11 insertions(+), 8 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 1f0cfd4..3a0a600 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -76,9 +76,9 @@
if (!Cools.isEmpty(followerName)){
User username = userService.selectOne(new EntityWrapper<User>().eq("username", followerName));
if (!Cools.isEmpty(username)){
- List<Integer> cstmrIds = cstmrFollService.selectCstmrIdUserId(username.getId().intValue());
- for (Integer id : cstmrIds){
- ids.add(id);
+ List<CstmrFoll> cstmrIds = cstmrFollService.selectCstmrIdUserId(username.getId().intValue());
+ for (CstmrFoll id : cstmrIds){
+ ids.add(id.getCstmrId().intValue());
}
}else {
return R.error("鏈煡璇㈠埌璺熻繘浜轰俊鎭紒");
diff --git a/src/main/java/com/zy/crm/manager/mapper/CstmrFollMapper.java b/src/main/java/com/zy/crm/manager/mapper/CstmrFollMapper.java
index 35eda74..b03008b 100644
--- a/src/main/java/com/zy/crm/manager/mapper/CstmrFollMapper.java
+++ b/src/main/java/com/zy/crm/manager/mapper/CstmrFollMapper.java
@@ -11,5 +11,5 @@
@Mapper
@Repository
public interface CstmrFollMapper extends BaseMapper<CstmrFoll> {
- List<Integer> selectCstmrIdUserId(@Param("userId")Integer userId);
+ List<CstmrFoll> selectCstmrIdUserId(@Param("userId")Integer userId);
}
diff --git a/src/main/java/com/zy/crm/manager/service/CstmrFollService.java b/src/main/java/com/zy/crm/manager/service/CstmrFollService.java
index 1a8ce73..48471aa 100644
--- a/src/main/java/com/zy/crm/manager/service/CstmrFollService.java
+++ b/src/main/java/com/zy/crm/manager/service/CstmrFollService.java
@@ -6,5 +6,5 @@
import java.util.List;
public interface CstmrFollService extends IService<CstmrFoll> {
- List<Integer> selectCstmrIdUserId(Integer cstmrIds);
+ List<CstmrFoll> selectCstmrIdUserId(Integer cstmrIds);
}
diff --git a/src/main/java/com/zy/crm/manager/service/impl/CstmrFollServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/CstmrFollServiceImpl.java
index 58580fd..ae13390 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/CstmrFollServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/CstmrFollServiceImpl.java
@@ -11,7 +11,7 @@
@Service("cstmrFollService")
public class CstmrFollServiceImpl extends ServiceImpl<CstmrFollMapper, CstmrFoll> implements CstmrFollService {
@Override
- public List<Integer> selectCstmrIdUserId(Integer userId) {
+ public List<CstmrFoll> selectCstmrIdUserId(Integer userId) {
return this.baseMapper.selectCstmrIdUserId(userId);
}
}
diff --git a/src/main/webapp/views/cstmr/cstmr.html b/src/main/webapp/views/cstmr/cstmr.html
index d600028..1bdba69 100644
--- a/src/main/webapp/views/cstmr/cstmr.html
+++ b/src/main/webapp/views/cstmr/cstmr.html
@@ -65,10 +65,13 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <input class="layui-input" type="text" name="followerName" placeholder="璺熻繘浜�" autocomplete="off" style="border-color: #e1e1e1">
+ <label class="layui-form-label">璺熻繘浜�:</label>
+ <div class="layui-input-block">
+ <input class="layui-input" type="text" name="followerName" placeholder="璺熻繘浜�" autocomplete="off" style="border-color: #e1e1e1">
+ </div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閫夋嫨妗�</label>
+ <label class="layui-form-label">鎸囧畾瀛楁:</label>
<div class="layui-input-block">
<select id="conditionNameSelect" name="conditionName" lay-search>
<option value = "" > 璇烽�夋嫨... </option>
--
Gitblit v1.9.1