提交

yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java

@@ -226,7 +226,6 @@ public class FloweController extends BaseController {
         FlowLabourInfo where = new FlowLabourInfo();
         if(deptId<=0){
             if (SecurityUtils.isUserB()) {
-                where.setNowRole(Convert.toStr(SecurityUtils.getRoleId()));
                 where.setPrjIds(getProjectIds());
             }
         }

yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/impl/FlowLabourInfoServiceImpl.java

@@ -136,10 +136,6 @@ public class FlowLabourInfoServiceImpl implements IFlowLabourInfoService
      */
     @Override
     public Map<String, Object> findFlowLabourGroupCountByApprove(FlowLabourInfo flowLabourInfo){
-        if(Convert.toInt(flowLabourInfo.getNowRole())>4){
-            //这里总包只能审批自己单位数据
-            flowLabourInfo.setDeptId(Convert.toLong(flowLabourInfo.getNowDept()));
-        }
         List<Map<String, Object>> list = flowLabourInfoMapper.findGroupCountByApprove(flowLabourInfo);
         int db=0,yb=0;
         for(Map<String, Object> map:list){

yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml

@@ -92,7 +92,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginDate != null and params.beginDate != '' and params.endDate != null and params.endDate != ''"> and date(fl.create_time) between #{params.beginDate} and #{params.endDate}</if>
             <!-- 查询条件-项目部门 -->
             <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
-            <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
             <if test="prjIds !=null and prjIds.size()>0">
                 and spc.project_id in
                 <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">