Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
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
haoban3.0
haoban-manage3.0
Commits
21cb3765
Commit
21cb3765
authored
May 12, 2022
by
墨竹
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://git.gicdev.com/haoban3.0/haoban-manage3.0
into developer
parents
93db749f
51629c18
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
21 additions
and
14 deletions
+21
-14
StaffApiService.java
...va/com/gic/haoban/manage/api/service/StaffApiService.java
+1
-1
StaffMapper.java
...com/gic/haoban/manage/service/dao/mapper/StaffMapper.java
+1
-1
TabHaobanExternalClerkRelatedMapper.java
...rvice/dao/mapper/TabHaobanExternalClerkRelatedMapper.java
+2
-1
ExternalClerkRelatedServiceImpl.java
...service/service/impl/ExternalClerkRelatedServiceImpl.java
+8
-2
StaffApiServiceImpl.java
.../manage/service/service/out/impl/StaffApiServiceImpl.java
+2
-2
StaffMapper.xml
...manage3-service/src/main/resources/mapper/StaffMapper.xml
+3
-3
TabHaobanExternalClerkRelatedMapper.xml
.../resources/mapper/TabHaobanExternalClerkRelatedMapper.xml
+1
-1
WxEnterpriseInfoController.java
...ban/manage/web/controller/WxEnterpriseInfoController.java
+3
-3
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java
View file @
21cb3765
...
@@ -15,7 +15,7 @@ public interface StaffApiService {
...
@@ -15,7 +15,7 @@ public interface StaffApiService {
List
<
StaffDTO
>
listByIds
(
List
<
String
>
staffIds
);
List
<
StaffDTO
>
listByIds
(
List
<
String
>
staffIds
);
List
<
StaffDTO
>
listByWxUserId
(
String
wxUserId
);
List
<
StaffDTO
>
listByWxUserId
(
String
wxUserId
,
String
wxEnterpriseId
);
StaffDTO
selectByNationcodeAndPhoneNumber
(
String
wxEnterpriseId
,
String
nationcode
,
String
phoneNumber
);
StaffDTO
selectByNationcodeAndPhoneNumber
(
String
wxEnterpriseId
,
String
nationcode
,
String
phoneNumber
);
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java
View file @
21cb3765
...
@@ -20,7 +20,7 @@ public interface StaffMapper {
...
@@ -20,7 +20,7 @@ public interface StaffMapper {
List
<
TabHaobanStaff
>
listByIds
(
@Param
(
"staffIds"
)
List
<
String
>
staffIds
);
List
<
TabHaobanStaff
>
listByIds
(
@Param
(
"staffIds"
)
List
<
String
>
staffIds
);
List
<
TabHaobanStaff
>
listByWxUserId
(
@Param
(
"wxUserId"
)
String
wxUserId
);
List
<
TabHaobanStaff
>
listByWxUserId
(
@Param
(
"wxUserId"
)
String
wxUserId
,
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
);
List
<
TabHaobanStaff
>
listLikeName
(
@Param
(
"staffName"
)
String
staffName
,
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
);
List
<
TabHaobanStaff
>
listLikeName
(
@Param
(
"staffName"
)
String
staffName
,
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
);
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java
View file @
21cb3765
...
@@ -18,7 +18,8 @@ public interface TabHaobanExternalClerkRelatedMapper {
...
@@ -18,7 +18,8 @@ public interface TabHaobanExternalClerkRelatedMapper {
int
updateByPrimaryKeySelective
(
TabHaobanExternalClerkRelated
record
);
int
updateByPrimaryKeySelective
(
TabHaobanExternalClerkRelated
record
);
TabHaobanExternalClerkRelated
selectByClerkIdAndExternalUserId
(
@Param
(
"clerkId"
)
String
clerkId
,
@Param
(
"externalUserId"
)
String
externalUserId
);
TabHaobanExternalClerkRelated
selectByClerkIdAndExternalUserId
(
@Param
(
"clerkId"
)
String
clerkId
,
@Param
(
"externalUserId"
)
String
externalUserId
);
void
delByUserIdAndExternalUserId
(
TabHaobanExternalClerkRelated
record
);
void
delByUserIdAndExternalUserId
(
TabHaobanExternalClerkRelated
record
);
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ExternalClerkRelatedServiceImpl.java
View file @
21cb3765
...
@@ -69,7 +69,13 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
...
@@ -69,7 +69,13 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
public
void
delByUserIdAndExternalUserId
(
MemberUnionidRelatedDTO
dto
)
{
public
void
delByUserIdAndExternalUserId
(
MemberUnionidRelatedDTO
dto
)
{
mapper
.
delByUserIdAndExternalUserId
(
EntityUtil
.
changeEntityByJSON
(
TabHaobanExternalClerkRelated
.
class
,
dto
));
mapper
.
delByUserIdAndExternalUserId
(
EntityUtil
.
changeEntityByJSON
(
TabHaobanExternalClerkRelated
.
class
,
dto
));
String
wxUserId
=
dto
.
getWxUserId
();
String
wxUserId
=
dto
.
getWxUserId
();
List
<
TabHaobanStaff
>
tabHaobanStaffs
=
staffMapper
.
listByWxUserId
(
wxUserId
);
String
externalUserid
=
dto
.
getExternalUserid
();
List
<
TabHaobanExternalClerkRelated
>
tabHaobanExternalClerkRelatedList
=
mapper
.
listByExTernalUseridAndWxUserId
(
externalUserid
,
wxUserId
,
2
);
if
(
CollectionUtils
.
isEmpty
(
tabHaobanExternalClerkRelatedList
))
{
logger
.
info
(
"无解除的好友关系:externalUserid:{},wxUserId:{}"
,
externalUserid
,
wxUserId
);
return
;
}
List
<
TabHaobanStaff
>
tabHaobanStaffs
=
staffMapper
.
listByWxUserId
(
wxUserId
,
tabHaobanExternalClerkRelatedList
.
get
(
0
).
getWxEnterpriseId
());
if
(
CollectionUtils
.
isEmpty
(
tabHaobanStaffs
))
{
if
(
CollectionUtils
.
isEmpty
(
tabHaobanStaffs
))
{
logger
.
error
(
"找不到员工:wxUserId:{}"
,
wxUserId
);
logger
.
error
(
"找不到员工:wxUserId:{}"
,
wxUserId
);
return
;
return
;
...
@@ -147,7 +153,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
...
@@ -147,7 +153,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
@Override
@Override
public
List
<
TabHaobanExternalClerkRelated
>
listByExTernalUseridAndWxUserId
(
String
externalUserid
,
String
wxUserId
)
{
public
List
<
TabHaobanExternalClerkRelated
>
listByExTernalUseridAndWxUserId
(
String
externalUserid
,
String
wxUserId
)
{
return
mapper
.
listByExTernalUseridAndWxUserId
(
externalUserid
,
wxUserId
,
1
);
return
mapper
.
listByExTernalUseridAndWxUserId
(
externalUserid
,
wxUserId
,
1
);
}
}
@Override
@Override
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
View file @
21cb3765
...
@@ -1112,8 +1112,8 @@ public class StaffApiServiceImpl implements StaffApiService {
...
@@ -1112,8 +1112,8 @@ public class StaffApiServiceImpl implements StaffApiService {
}
}
@Override
@Override
public
List
<
StaffDTO
>
listByWxUserId
(
String
wxUserId
)
{
public
List
<
StaffDTO
>
listByWxUserId
(
String
wxUserId
,
String
wxEnterpriseId
)
{
List
<
TabHaobanStaff
>
list
=
staffMapper
.
listByWxUserId
(
wxUserId
);
List
<
TabHaobanStaff
>
list
=
staffMapper
.
listByWxUserId
(
wxUserId
,
wxEnterpriseId
);
return
EntityUtil
.
changeEntityListByJSON
(
StaffDTO
.
class
,
list
);
return
EntityUtil
.
changeEntityListByJSON
(
StaffDTO
.
class
,
list
);
}
}
...
...
haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml
View file @
21cb3765
...
@@ -305,9 +305,9 @@
...
@@ -305,9 +305,9 @@
select
select
<include
refid=
"Base_Column_List"
/>
<include
refid=
"Base_Column_List"
/>
from tab_haoban_staff
from tab_haoban_staff
where status_flag = 1
where status_flag = 1
and wx_user_id = #{wxUserId,jdbcType=VARCHAR}
<if
test=
"wx
UserId != null
"
>
<if
test=
"wx
EnterpriseId != null and wxEnterpriseId != ''
"
>
and wx_
user_id = #{wxUser
Id,jdbcType=VARCHAR}
and wx_
enterprise_id = #{wxEnterprise
Id,jdbcType=VARCHAR}
</if>
</if>
</select>
</select>
...
...
haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml
View file @
21cb3765
...
@@ -314,7 +314,7 @@
...
@@ -314,7 +314,7 @@
and status_flag = 1
and status_flag = 1
</select>
</select>
<select
id=
"listByExTernalUseridAndWxUserId"
resultMap=
"BaseResultMap"
parameterType=
"java.lang.String"
>
<select
id=
"listByExTernalUseridAndWxUserId"
resultMap=
"BaseResultMap"
>
select
select
<include
refid=
"Base_Column_List"
/>
<include
refid=
"Base_Column_List"
/>
from tab_haoban_external_clerk_related
from tab_haoban_external_clerk_related
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java
View file @
21cb3765
...
@@ -141,10 +141,10 @@ public class WxEnterpriseInfoController extends WebBaseController {
...
@@ -141,10 +141,10 @@ public class WxEnterpriseInfoController extends WebBaseController {
DictDTO
loginUserId
=
managerDictService
.
getSMSDict
(
"app_login_phone_num"
,
loginStaff
.
getPhoneNumber
());
DictDTO
loginUserId
=
managerDictService
.
getSMSDict
(
"app_login_phone_num"
,
loginStaff
.
getPhoneNumber
());
logger
.
info
(
"伪登录:{},userId:{}"
,
loginStaff
.
getPhoneNumber
(),
JSONObject
.
toJSONString
(
loginUserId
));
logger
.
info
(
"伪登录:{},userId:{}"
,
loginStaff
.
getPhoneNumber
(),
JSONObject
.
toJSONString
(
loginUserId
));
if
(
null
!=
loginUserId
)
{
if
(
null
!=
loginUserId
)
{
String
val
=
loginUserId
.
getDictValue
();
String
dictValue
=
loginUserId
.
getDictValue
();
List
<
StaffDTO
>
staffDTOS
=
new
ArrayList
<>();
List
<
StaffDTO
>
staffDTOS
=
new
ArrayList
<>();
List
<
StaffDTO
>
phoneDtos
=
staffApiService
.
listByPhoneNumber
(
val
);
List
<
StaffDTO
>
phoneDtos
=
staffApiService
.
listByPhoneNumber
(
dictValue
);
List
<
StaffDTO
>
userDtos
=
staffApiService
.
listByWxUserId
(
val
);
List
<
StaffDTO
>
userDtos
=
staffApiService
.
listByWxUserId
(
dictValue
,
loginStaff
.
getWxEnterpriseId
()
);
if
(
CollectionUtils
.
isNotEmpty
(
phoneDtos
))
{
if
(
CollectionUtils
.
isNotEmpty
(
phoneDtos
))
{
staffDTOS
.
addAll
(
phoneDtos
);
staffDTOS
.
addAll
(
phoneDtos
);
}
}
...
...
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