Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zczlService
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
曹崟
zczlService
Commits
9b4661be
Commit
9b4661be
authored
Apr 24, 2019
by
caoyin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改具备审批权限,但是未分配具体业务的审批权限导致进入需要我审批的侦查指令模块报错的bug
parent
7b03a761
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
src/main/java/com/founder/zczl/controller/ZczlController.java
+9
-1
src/main/resources/mapper/ZczlMapper.xml
+2
-1
No files found.
src/main/java/com/founder/zczl/controller/ZczlController.java
View file @
9b4661be
...
@@ -1150,6 +1150,14 @@ public class ZczlController {
...
@@ -1150,6 +1150,14 @@ public class ZczlController {
//如果是第一次查询判断具体权限,然后查询出对应权限的具体指令
//如果是第一次查询判断具体权限,然后查询出对应权限的具体指令
if
(
ifFirst
==
null
||
""
.
equals
(
ifFirst
.
trim
())){
//第一次查询
if
(
ifFirst
==
null
||
""
.
equals
(
ifFirst
.
trim
())){
//第一次查询
List
qxList
=
(
List
)
map
.
get
(
"qxList"
);
List
qxList
=
(
List
)
map
.
get
(
"qxList"
);
//非admin处理未指定业务类型审批权限----返回空数据
if
(!
"admin"
.
equals
(
user
.
getUsername
())&&(
qxList
==
null
||
qxList
.
size
()==
0
)){
List
<
Map
<
String
,
Object
>>
jeMapList
=
new
ArrayList
<>();
Map
<
String
,
Object
>
resultMapHtml
=
new
HashMap
<
String
,
Object
>();
resultMapHtml
.
put
(
"total"
,
0
);
resultMapHtml
.
put
(
"rows"
,
jeMapList
);
return
resultMapHtml
;
}
tbYwZczl
.
setYwbhList
(
qxList
);
tbYwZczl
.
setYwbhList
(
qxList
);
}
}
tbYwZczl
.
setUsername
(
user
.
getUsername
());
tbYwZczl
.
setUsername
(
user
.
getUsername
());
...
@@ -1182,7 +1190,7 @@ public class ZczlController {
...
@@ -1182,7 +1190,7 @@ public class ZczlController {
String
ywlx
=
zczl
.
getYwlx
();
String
ywlx
=
zczl
.
getYwlx
();
String
perurl
=
(
String
)
map
.
get
(
"qxStr"
);
String
perurl
=
(
String
)
map
.
get
(
"qxStr"
);
//具有对应的权限且(未指定审批人或指定审批人且为自己)
//具有对应的权限且(未指定审批人或指定审批人且为自己)
if
(
perurl
.
indexOf
(
ywlx
)!=-
1
&&((
zczl
.
getZdsprjh
()==
null
||
""
.
equals
(
zczl
.
getZdsprjh
().
trim
()))||
user
.
getPolicemanid
().
equals
(
zczl
.
getZdsprjh
()))){
if
(
perurl
!=
null
&&
perurl
.
indexOf
(
ywlx
)!=-
1
&&((
zczl
.
getZdsprjh
()==
null
||
""
.
equals
(
zczl
.
getZdsprjh
().
trim
()))||
user
.
getPolicemanid
().
equals
(
zczl
.
getZdsprjh
()))){
objectMap
.
put
(
"ifsp"
,
"1"
);
//是否能审批 1-能 0-不能
objectMap
.
put
(
"ifsp"
,
"1"
);
//是否能审批 1-能 0-不能
}
else
{
}
else
{
objectMap
.
put
(
"ifsp"
,
"0"
);
//是否能审批 1-能 0-不能
objectMap
.
put
(
"ifsp"
,
"0"
);
//是否能审批 1-能 0-不能
...
...
src/main/resources/mapper/ZczlMapper.xml
View file @
9b4661be
...
@@ -1838,7 +1838,8 @@
...
@@ -1838,7 +1838,8 @@
<select
id=
"queryAllUserIdByYwlx"
parameterType=
"java.lang.String"
resultType=
"java.lang.String"
>
<select
id=
"queryAllUserIdByYwlx"
parameterType=
"java.lang.String"
resultType=
"java.lang.String"
>
select USERID as userId
select USERID as userId
from TB_YW_ZCZL_SPQX where xxsc_pdbz=0 and ywlx like '%'||#{startId, jdbcType=VARCHAR}||'%'
from TB_YW_ZCZL_SPQX spqx ,SYS_USER u where spqx.xxsc_pdbz=0 and spqx.ywlx like '%'||#{startId, jdbcType=VARCHAR}||'%'
and u.scbz=0 and u.open_flag='1' and spqx.USERID = u.id
</select>
</select>
...
...
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