Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
Laisi_AutoMES2
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
jiawei.su
Laisi_AutoMES2
Commits
d6dbe6f8
Commit
d6dbe6f8
authored
Jan 23, 2021
by
xin.yang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
0faacf9d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
AutomationLocationController.cs
.../Siger.ApiACC/Controllers/AutomationLocationController.cs
+2
-1
AutomationFixtureToolsAssemblyRepository.cs
.../Repositories/AutomationFixtureToolsAssemblyRepository.cs
+2
-1
No files found.
Server/Apis/Siger.ApiACC/Controllers/AutomationLocationController.cs
View file @
d6dbe6f8
...
...
@@ -69,7 +69,8 @@ namespace Siger.ApiACC.Controllers
{
var
locas
=
GetParentLocations
(
loca
.
id
,
locations
);
var
locationIds
=
locas
.
Select
(
q
=>
q
.
id
).
ToList
();
locationIds
.
Distinct
().
Reverse
();
locationIds
=
locationIds
.
Distinct
().
ToList
();
locationIds
.
Reverse
();
item
.
locationIds
=
locationIds
;
}
...
...
Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationFixtureToolsAssemblyRepository.cs
View file @
d6dbe6f8
...
...
@@ -26,7 +26,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
var
query
=
from
q
in
_context
.
siger_automation_fixture_tools_assembly
join
t1
in
_context
.
siger_automation_fixture_tools
on
q
.
parent
equals
t1
.
guid
into
tt1
from
t1
in
tt1
.
DefaultIfEmpty
()
join
c1
in
_context
.
siger_automation_fixture_tools_category
on
t1
.
category
equals
c1
.
guid
join
c1
in
_context
.
siger_automation_fixture_tools_category
on
t1
.
category
equals
c1
.
guid
into
cc1
from
c1
in
cc1
.
DefaultIfEmpty
()
join
t2
in
_context
.
siger_automation_fixture_tools
on
q
.
son
equals
t2
.
guid
join
c2
in
_context
.
siger_automation_fixture_tools_category
on
t2
.
category
equals
c2
.
guid
join
u
in
_context
.
siger_project_user
on
q
.
updator
equals
u
.
mid
into
uu
...
...
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