明树Git Lab
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
J
jt_backend
Project
Project
Details
Activity
Releases
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
zengfanpei
jt_backend
Commits
fe054255
Commit
fe054255
authored
Dec 02, 2025
by
zfp1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
b88b2e7f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
20 deletions
+19
-20
projectController.js
controller/projectController.js
+17
-18
roleMenu.js
db/model/system/roleMenu.js
+2
-2
No files found.
controller/projectController.js
View file @
fe054255
...
...
@@ -160,7 +160,7 @@ async function createProject(req, res, next) {
});
let
approvers
=
await
userModule
.
getProjectApprover
(
req
.
user
.
id
,
'xmgs_xmspr'
);
if
(
!
(
approvers
&&
approvers
.
length
>
0
))
{
return
res
.
sendError
({
code
:
'60001'
,
msg
:
'项目已保存,请联系管理员为本公司添加【项目初审】角色人员'
});
return
res
.
sendError
({
code
:
'60001'
,
msg
:
'项目已保存,请联系管理员为本公司添加【项目初审】角色人员'
});
}
await
DB
.
Message
.
create
({
projectId
:
project
.
id
,
...
...
@@ -646,17 +646,15 @@ async function getOwnProjects(req, res, next) {
let
messs
=
await
DB
.
Message
.
findAll
({
//项目审批信息接收方
where
:
{
[
Op
.
and
]:
[
sequelize
.
where
(
sequelize
.
fn
(
'JSON_CONTAINS'
,
sequelize
.
col
(
'receivers'
),
sequelize
.
cast
(
req
.
user
.
id
,
'JSON'
),
'$'
),
true
[
Op
.
and
]:
[
sequelize
.
where
(
sequelize
.
fn
(
'JSON_CONTAINS'
,
sequelize
.
col
(
'receivers'
),
sequelize
.
cast
(
req
.
user
.
id
,
'JSON'
),
// 直接将数字转换为JSON
sequelize
.
literal
(
"'$'"
)
),
,
{
projectId
:
{
[
Op
.
ne
]:
null
}
},
true
),
{
projectId
:
{
[
Op
.
ne
]:
null
}
},
]
},
attributes
:
[
'projectId'
]
...
...
@@ -664,16 +662,17 @@ async function getOwnProjects(req, res, next) {
console
.
log
(
messs
)
let
projectIds
=
messs
.
map
(
o
=>
{
return
o
&&
o
.
projectId
});
//
let
cArr
=
[
{
projectCreator
:
req
.
user
.
id
},
{
id
:
{
[
Op
.
in
]:
projectIds
}
}
]
if
(
req
.
body
.
projectName
)
{
cArr
.
push
({
projectName
:
{
[
Op
.
like
]:
`%
${
req
.
body
.
projectName
}
%`
}
});
}
search
.
where
=
{
[
Op
.
or
]:
[
{
projectCreator
:
req
.
user
.
id
},
{
id
:
{
[
Op
.
in
]:
projectIds
}
}
]
[
Op
.
or
]:
cArr
};
if
(
req
.
body
.
name
)
{
search
.
where
[[
Op
.
or
]].
push
({
name
:
{
[
Op
.
like
]:
`%
${
req
.
body
.
name
}
%`
}
});
}
search
.
limit
=
limit
;
search
.
offset
=
offset
;
if
(
req
.
body
.
attributes
&&
req
.
body
.
attributes
.
length
)
{
...
...
db/model/system/roleMenu.js
View file @
fe054255
...
...
@@ -26,8 +26,8 @@ const RoleMenu = sequelize.define('RoleMenu', {
// 同步模型到数据库(创建表)
RoleMenu
.
sync
({
//
force: false, // force: true 会删除已存在表并重新创建
alter
:
true
force
:
false
,
// force: true 会删除已存在表并重新创建
//
alter: true
})
.
then
(()
=>
{
console
.
log
(
'RoleMenu 表同步成功'
);
...
...
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