Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-cr20g
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
dsk-cr20g
Commits
6024ebac
Commit
6024ebac
authored
May 26, 2023
by
lcl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
u
parent
6651c7bf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
7 deletions
+4
-7
CustomerController.java
...a/com/dsk/web/controller/customer/CustomerController.java
+0
-3
CustomerFollowRecordMapper.java
...ava/com/dsk/system/mapper/CustomerFollowRecordMapper.java
+1
-1
CustomerFollowRecordServiceImpl.java
.../system/service/impl/CustomerFollowRecordServiceImpl.java
+2
-2
CustomerFollowRecordMapper.xml
...ces/mapper/system/customer/CustomerFollowRecordMapper.xml
+1
-1
No files found.
dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java
View file @
6024ebac
...
@@ -7,7 +7,6 @@ import com.dsk.common.annotation.Log;
...
@@ -7,7 +7,6 @@ import com.dsk.common.annotation.Log;
import
com.dsk.common.annotation.RepeatSubmit
;
import
com.dsk.common.annotation.RepeatSubmit
;
import
com.dsk.common.core.controller.BaseController
;
import
com.dsk.common.core.controller.BaseController
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.core.domain.entity.SysRole
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.enums.BusinessType
;
import
com.dsk.common.enums.BusinessType
;
import
com.dsk.common.utils.poi.ExcelUtil
;
import
com.dsk.common.utils.poi.ExcelUtil
;
...
@@ -18,13 +17,11 @@ import com.dsk.system.service.ICustomerService;
...
@@ -18,13 +17,11 @@ import com.dsk.system.service.ICustomerService;
import
com.dsk.web.controller.search.service.BusinessOpportunityRadarService
;
import
com.dsk.web.controller.search.service.BusinessOpportunityRadarService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.MultipartFile
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
...
dsk-system/src/main/java/com/dsk/system/mapper/CustomerFollowRecordMapper.java
View file @
6024ebac
...
@@ -18,7 +18,7 @@ import java.util.List;
...
@@ -18,7 +18,7 @@ import java.util.List;
@Mapper
@Mapper
public
interface
CustomerFollowRecordMapper
extends
BaseMapper
<
CustomerFollowRecord
>
{
public
interface
CustomerFollowRecordMapper
extends
BaseMapper
<
CustomerFollowRecord
>
{
List
<
CustomerFollowRecord
>
selectList
(
@Param
(
"dto"
)
CustomerFollowRecordSearchDto
dto
);
List
<
CustomerFollowRecord
>
select
Auth
List
(
@Param
(
"dto"
)
CustomerFollowRecordSearchDto
dto
);
}
}
dsk-system/src/main/java/com/dsk/system/service/impl/CustomerFollowRecordServiceImpl.java
View file @
6024ebac
...
@@ -31,7 +31,7 @@ public class CustomerFollowRecordServiceImpl implements ICustomerFollowRecordSer
...
@@ -31,7 +31,7 @@ public class CustomerFollowRecordServiceImpl implements ICustomerFollowRecordSer
@Override
@Override
// @DataScope(deptAlias = "d",userAlias = "u")
// @DataScope(deptAlias = "d",userAlias = "u")
public
List
<
CustomerFollowRecord
>
selectList
(
CustomerFollowRecordSearchDto
dto
)
{
public
List
<
CustomerFollowRecord
>
selectList
(
CustomerFollowRecordSearchDto
dto
){
LambdaQueryWrapper
<
CustomerFollowRecord
>
wrapper
=
Wrappers
.
lambdaQuery
();
LambdaQueryWrapper
<
CustomerFollowRecord
>
wrapper
=
Wrappers
.
lambdaQuery
();
if
(!
ObjectUtils
.
isEmpty
(
dto
.
getCustomerId
()))
{
if
(!
ObjectUtils
.
isEmpty
(
dto
.
getCustomerId
()))
{
wrapper
.
eq
(
CustomerFollowRecord:
:
getCustomerId
,
dto
.
getCustomerId
());
wrapper
.
eq
(
CustomerFollowRecord:
:
getCustomerId
,
dto
.
getCustomerId
());
...
@@ -41,7 +41,7 @@ public class CustomerFollowRecordServiceImpl implements ICustomerFollowRecordSer
...
@@ -41,7 +41,7 @@ public class CustomerFollowRecordServiceImpl implements ICustomerFollowRecordSer
return
baseMapper
.
selectList
(
wrapper
);
return
baseMapper
.
selectList
(
wrapper
);
// dto.setUserId(SecurityUtils.getUserId());
// dto.setUserId(SecurityUtils.getUserId());
// return baseMapper.selectList(dto);
// return baseMapper.select
Auth
List(dto);
}
}
@Override
@Override
...
...
dsk-system/src/main/resources/mapper/system/customer/CustomerFollowRecordMapper.xml
View file @
6024ebac
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
cfr.content, cfr.create_time
cfr.content, cfr.create_time
</sql>
</sql>
<select
id=
"selectList"
resultType=
"com.dsk.system.domain.customer.CustomerFollowRecord"
>
<select
id=
"select
Auth
List"
resultType=
"com.dsk.system.domain.customer.CustomerFollowRecord"
>
select
select
<include
refid=
"Base_Bean"
></include>
<include
refid=
"Base_Bean"
></include>
from customer_follow_record cfr
from customer_follow_record cfr
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment