数据权限

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/WorkBenchService.java

@@ -1,5 +1,6 @@
 package com.rtrh.projects.modules.projects.service;
 
+import com.rtrh.projects.modules.projects.vo.SubInfoQueryTzVO;
 import com.rtrh.projects.modules.system.vo.LoginUserVO;
 
 import java.math.BigDecimal;
@@ -36,7 +37,8 @@ public interface WorkBenchService {
 	List<Map<String, Object>> getTotalList(String kind, String status, String type,
 			Date beginDate, Date endDate, String subName,String currStage, String loginName);
 
-	Map<String,Object> getStatisticData(String kind, LoginUserVO loginUserVO);
+	Map<String,Object> getStatisticData(String kind, LoginUserVO loginUserVO,SubInfoQueryTzVO queryVO);
+
 
 
 	/**

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/WorkBenchServiceImpl.java

@@ -9,14 +9,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import com.rtrh.projects.modules.projects.enums.SubInfoCbStatusEnum;
 import com.rtrh.projects.modules.projects.enums.SubInfoStatusEnum;
 import com.rtrh.projects.modules.projects.mapper.SubInfoMapper;
 import com.rtrh.projects.modules.projects.po.SubInfoGxj;
 import com.rtrh.projects.modules.projects.vo.SubInfoQueryTzVO;
-import com.rtrh.projects.modules.projects.vo.WorkBenchVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -50,12 +46,9 @@ public class WorkBenchServiceImpl implements WorkBenchService {
 	}
 
 	@Override
-	public Map<String, Object> getStatisticData(String kind, LoginUserVO loginUserVO) {
-		Map<String,Object> dataMap = new HashMap<String, Object>();
-
-		SubInfoQueryTzVO queryVO = new SubInfoQueryTzVO();
-		queryVO.setStatus(null);
+	public Map<String, Object> getStatisticData(String kind, LoginUserVO loginUserVO, SubInfoQueryTzVO queryVO) {
 		List<SubInfoGxj> listTotal = subInfoMapper.queryStatistics(queryVO);
+		Map<String,Object> dataMap = new HashMap<String, Object>();
 		Map<String, Long> categoryMap = listTotal.stream().collect(Collectors.groupingBy(SubInfoGxj::getStatus, Collectors.counting()));
 		// 项目总数、储备、新建、在建、投产、年度开工率
 		dataMap.put("totalNum", listTotal.size());

projects-service/src/main/java/com/rtrh/projects/modules/rolemeun/mapper/SecUserAuthMapper.xml

@@ -14,6 +14,7 @@
             sec_user_auth a
         WHERE
             a.logic_delete_flag = 0
+          AND u.status_subject = '1'
           AND u.id = a.user_id
           AND u.id = #{userId}
     </select>

projects/src/main/java/com/rtrh/projects/web/controller/subject/api/WorkBenchTwoApiController.java

@@ -3,6 +3,7 @@ package com.rtrh.projects.web.controller.subject.api;
 import java.util.List;
 import java.util.Map;
 
+import com.rtrh.projects.modules.projects.vo.SubInfoQueryTzVO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +61,10 @@ public class WorkBenchTwoApiController extends BaseController {
 	public Message getStatis() {
 		Message message = new Message();
 		try {
-			Map<String,Object> data = workBenchService.getStatisticData(getCurUser().getKind(), getCurUser().getLoginUser());
+			SubInfoQueryTzVO queryVO = new SubInfoQueryTzVO();
+			queryVO.setSubjectAuthIds(getSubjectIds());
+			queryVO.setStatus(null);
+			Map<String,Object> data = workBenchService.getStatisticData(getCurUser().getKind(), getCurUser().getLoginUser(),queryVO);
 			message.setData(data);
 		} catch (Exception e) {
 			logger.error("",e);

projects/src/main/webapp/vmodules/workBench/zr_gzt.jsp

@@ -97,7 +97,8 @@
 <%--                    </div>--%>
 <%--                </div>--%>
                 <div class="line"></div>
-                <div class="layui-card" @click="offsetCt()">
+<%--                <div class="layui-card" @click="offsetCt()">--%>
+                <div class="layui-card">
                     <div class="layui-card-body">
                         <div class="img_num">
                             <img src="${WebSite.asset }/css/images/workPlat/remind.png"/>