Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
midjourney-proxy
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
徐少华
midjourney-proxy
Commits
28b3563d
Commit
28b3563d
authored
Jan 13, 2021
by
吴博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixbug:[none] fixclassify
parent
9d7e73a2
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
8 deletions
+8
-8
BookGroupBizImpl.java
...java/com/pcloud/book/group/biz/impl/BookGroupBizImpl.java
+1
-1
BookGroupClassifyBizImpl.java
.../pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java
+1
-1
RightsSettingBizImpl.java
...oud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java
+1
-1
RightsSetting.java
...a/com/pcloud/book/rightsSetting/entity/RightsSetting.java
+1
-1
PcloudGroupActivityDao.java
...ava/com/pcloud/book/skill/dao/PcloudGroupActivityDao.java
+1
-1
PcloudGroupActivityDaoImpl.java
...cloud/book/skill/dao/impl/PcloudGroupActivityDaoImpl.java
+2
-2
PcloudGroupActivityDao.xml
...rc/main/resources/mapper/skill/PcloudGroupActivityDao.xml
+1
-1
No files found.
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupBizImpl.java
View file @
28b3563d
...
...
@@ -5495,7 +5495,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
if
(
null
!=
adviserDto
)
{
// 新增判断是否K12分类
if
(
Objects
.
nonNull
(
adviserDto
.
getTempletId
()))
{
if
(
CollUtil
.
toList
(
RightsSettingConstant
.
K12_TEMPL
ATE_IDS
).
contains
(
adviserDto
.
getTempletId
()))
{
if
(
CollUtil
.
toList
(
RightsSettingConstant
.
K12_TEMPL
ET_ID_NEW
).
contains
(
adviserDto
.
getTempletId
()))
{
map
.
put
(
"isK12"
,
Boolean
.
TRUE
);
}
}
...
...
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java
View file @
28b3563d
...
...
@@ -1628,7 +1628,7 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
Map
<
Long
,
GroupActivity4AppletDTO
>
appletDTOMap
=
new
HashMap
<>();
if
(
ActivityGroupTypeEnum
.
THIRD_GROUP
.
value
.
equals
(
groupType
))
{
//第三方群
appletDTOMap
=
pcloudGroupActivityDao
.
getTh
ri
dPartByIds
(
groupIds
);
appletDTOMap
=
pcloudGroupActivityDao
.
getTh
ir
dPartByIds
(
groupIds
);
}
else
{
//群分类
appletDTOMap
=
pcloudGroupActivityDao
.
getGroupClassifyByIds
(
groupIds
);
...
...
pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java
View file @
28b3563d
...
...
@@ -2234,7 +2234,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
rightsSettingDto
.
setSecondClassifyContent
(
classifyMap
.
get
(
rightsSettingDto
.
getSecondClassify
()).
getTempletName
());
}
if
(!
MapUtils
.
isEmpty
(
classifyMap
)
&&
classifyMap
.
containsKey
(
rightsSettingDto
.
getThirdClassify
()))
{
rightsSettingDto
.
setTh
ri
dClassifyContent
(
classifyMap
.
get
(
rightsSettingDto
.
getThirdClassify
()).
getTempletName
());
rightsSettingDto
.
setTh
ir
dClassifyContent
(
classifyMap
.
get
(
rightsSettingDto
.
getThirdClassify
()).
getTempletName
());
}
if
(!
MapUtils
.
isEmpty
(
bookLabelMap
)
&&
bookLabelMap
.
containsKey
(
rightsSettingDto
.
getGradeLabelId
()))
{
rightsSettingDto
.
setGradeLabelIdContent
(
bookLabelMap
.
get
(
rightsSettingDto
.
getGradeLabelId
()).
getName
());
...
...
pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/entity/RightsSetting.java
View file @
28b3563d
...
...
@@ -212,7 +212,7 @@ public class RightsSetting extends BaseTempletClassify {
private
String
secondClassifyContent
;
private
String
th
ri
dClassifyContent
;
private
String
th
ir
dClassifyContent
;
private
String
gradeLabelIdContent
;
...
...
pcloud-service-book/src/main/java/com/pcloud/book/skill/dao/PcloudGroupActivityDao.java
View file @
28b3563d
...
...
@@ -35,7 +35,7 @@ public interface PcloudGroupActivityDao extends BaseDao<PcloudGroupActivity> {
List
<
Long
>
getGroupClassifyIds
(
Map
<
String
,
Object
>
paraMap
);
Map
<
Long
,
GroupActivity4AppletDTO
>
getTh
ri
dPartByIds
(
List
<
Long
>
ids
);
Map
<
Long
,
GroupActivity4AppletDTO
>
getTh
ir
dPartByIds
(
List
<
Long
>
ids
);
PcloudGroupActivity
getById
(
Long
id
);
...
...
pcloud-service-book/src/main/java/com/pcloud/book/skill/dao/impl/PcloudGroupActivityDaoImpl.java
View file @
28b3563d
...
...
@@ -104,8 +104,8 @@ public class PcloudGroupActivityDaoImpl extends BaseDaoImpl<PcloudGroupActivity>
}
@Override
public
Map
<
Long
,
GroupActivity4AppletDTO
>
getTh
ri
dPartByIds
(
List
<
Long
>
list
)
{
return
super
.
getSqlSession
().
selectMap
(
getStatement
(
"getTh
ri
dPartByIds"
),
list
,
"id"
);
public
Map
<
Long
,
GroupActivity4AppletDTO
>
getTh
ir
dPartByIds
(
List
<
Long
>
list
)
{
return
super
.
getSqlSession
().
selectMap
(
getStatement
(
"getTh
ir
dPartByIds"
),
list
,
"id"
);
}
@Override
...
...
pcloud-service-book/src/main/resources/mapper/skill/PcloudGroupActivityDao.xml
View file @
28b3563d
...
...
@@ -416,7 +416,7 @@
</select>
<!--根据id获取第三方群信息 -->
<select
id=
"getTh
ri
dPartByIds"
resultType=
"com.pcloud.book.applet.dto.GroupActivity4AppletDTO"
>
<select
id=
"getTh
ir
dPartByIds"
resultType=
"com.pcloud.book.applet.dto.GroupActivity4AppletDTO"
>
SELECT
a.id,
a.id groupActivityId,
...
...
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