Commit 9b4661be by caoyin

修改具备审批权限,但是未分配具体业务的审批权限导致进入需要我审批的侦查指令模块报错的bug

parent 7b03a761
......@@ -1150,6 +1150,14 @@ public class ZczlController {
//如果是第一次查询判断具体权限,然后查询出对应权限的具体指令
if(ifFirst==null||"".equals(ifFirst.trim())){//第一次查询
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.setUsername(user.getUsername());
......@@ -1182,7 +1190,7 @@ public class ZczlController {
String ywlx = zczl.getYwlx();
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-不能
}else{
objectMap.put("ifsp", "0");//是否能审批 1-能 0-不能
......
......@@ -1838,7 +1838,8 @@
<select id="queryAllUserIdByYwlx" parameterType="java.lang.String" resultType="java.lang.String">
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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment