Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart_gov_platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
smart_gov_platform
Commits
e208c1e5
Commit
e208c1e5
authored
2 years ago
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改根据业务查询部门逻辑
parent
d97de990
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
8 deletions
+4
-8
base-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java
...in/java/com/mortals/xhx/module/app/web/AppController.java
+0
-1
base-manager/src/main/java/com/mortals/xhx/module/app/web/AppVersionController.java
.../com/mortals/xhx/module/app/web/AppVersionController.java
+0
-3
base-manager/src/main/resources/sqlmap/module/matter/MatterMapperExt.xml
...c/main/resources/sqlmap/module/matter/MatterMapperExt.xml
+2
-2
base-manager/src/test/java/com/mortals/httpclient/matter/MatterController.http
.../java/com/mortals/httpclient/matter/MatterController.http
+2
-2
No files found.
base-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java
View file @
e208c1e5
...
...
@@ -65,7 +65,6 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
List
<
AppEntity
>
appEntityList
=
this
.
service
.
find
(
new
AppQuery
().
appCode
(
entity
.
getAppCode
()),
context
);
entity
.
setApplianceSiteScope
(
appEntityList
.
size
());
entity
.
setSiteIdList
(
appEntityList
.
stream
().
map
(
AppEntity:
:
getSiteId
).
collect
(
Collectors
.
toList
()));
SiteEntity
siteEntity
=
siteService
.
getCache
(
entity
.
getSiteId
().
toString
());
if
(!
ObjectUtils
.
isEmpty
(
siteEntity
)){
//请求地址 http://domian/app/siteCode/appcode/html
...
...
This diff is collapsed.
Click to expand it.
base-manager/src/main/java/com/mortals/xhx/module/app/web/AppVersionController.java
View file @
e208c1e5
...
...
@@ -49,9 +49,6 @@ import static com.mortals.xhx.common.key.Constant.CUSTAPP_ROOT_PATH;
@RequestMapping
(
"app/version"
)
public
class
AppVersionController
extends
BaseCRUDJsonBodyMappingController
<
AppVersionService
,
AppVersionEntity
,
Long
>
{
@Autowired
private
ParamService
paramService
;
@Autowired
private
SiteService
siteService
;
@Autowired
...
...
This diff is collapsed.
Click to expand it.
base-manager/src/main/resources/sqlmap/module/matter/MatterMapperExt.xml
View file @
e208c1e5
...
...
@@ -27,7 +27,7 @@
and a.matterName like #{condition.matterName}
</if>
<if
test=
"condition.source!=null and condition.source!=''"
>
and a.source = #{condition.source
,jdbcType=VARCHAR
}
and a.source = #{condition.source}
</if>
</trim>
</trim>
...
...
@@ -59,7 +59,7 @@
and a.matterName like #{condition.matterName}
</if>
<if
test=
"condition.source!=null and condition.source!=''"
>
and a.source = #{condition.source
,jdbcType=VARCHAR
}
and a.source = #{condition.source}
</if>
</trim>
</trim>
...
...
This diff is collapsed.
Click to expand it.
base-manager/src/test/java/com/mortals/httpclient/matter/MatterController.http
View file @
e208c1e5
...
...
@@ -43,8 +43,8 @@ Content-Type: application/json
{
"siteId":
54
,
"
matterName": ""
,
"siteId":
1
,
"
source": 0
,
"page": 1,
"size": 10
}
...
...
This diff is collapsed.
Click to expand it.
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