Merge branch 'dev' into pre-production

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/BeIndicatorsVO.java

@@ -1,5 +1,6 @@
 package com.logpm.supervise.vo.api;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.logpm.supervise.entity.IndicatorsAnnexEntity;
 import com.logpm.supervise.entity.IndicatorsEntity;
 import com.logpm.supervise.vo.IndicatorsVO;
@@ -20,7 +21,7 @@ public class BeIndicatorsVO  {
 //扣分
 	private Integer deductionPoints;
 
-	private List<IndicatorsVO> indicatorsVOS;
+	private Page<IndicatorsVO> indicatorsVOS;
 
 
 }

blade-service/logpm-supervise/pom.xml

@@ -39,6 +39,11 @@
             <artifactId>logpm-supervise-api</artifactId>
             <version>3.2.0.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-system-api</artifactId>
+            <version>3.2.0.RELEASE</version>
+        </dependency>
 
 
     </dependencies>

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java

@@ -76,13 +76,6 @@ public class ClassifyApi {
 		return r;
 	}
 
-
-
-
-
-
-
-
 	@GetMapping("/beMyApiIndicators")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "我被考核的列表")
@@ -92,4 +85,12 @@ public class ClassifyApi {
 		return r;
 	}
 
+	@GetMapping("/deptList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "我被考核的列表")
+	public R deptList() {
+		R r = classifyService.deptList();
+		return r;
+	}
+
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java

@@ -54,7 +54,6 @@ public interface IClassifyService extends BaseService<ClassifyEntity> {
 
 	/**
 	 * 查询指标项列表
-	 * @param classify
 	 * @return
 	 */
 	List<ClassifyApiVO> selectClassifyList();
@@ -94,4 +93,11 @@ public interface IClassifyService extends BaseService<ClassifyEntity> {
 	 * @return
 	 */
 	R beMyApiIndicators(Map<String, Object> params, IPage<IndicatorsVO> page);
+
+	/**
+	 * 查询部门列表
+	 * @return
+	 */
+	R deptList();
+
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

@@ -48,6 +48,9 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.entity.Dept;
+import org.springblade.system.feign.IDeptClient;
+import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -78,6 +81,11 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 
 	private final IndicatorsMapper indicatorsMapper;
 
+	private final IDeptClient deptClient;
+
+
+
+
 
 
 
@@ -322,13 +330,21 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		//查询我被考核的列表
 		Page<IndicatorsVO> indicatorsVOPage = indicatorsMapper.selectBeMyApiIndicators(page, params);
 		if (Func.isNotEmpty(indicatorsVOPage)){
-
-			beIndicatorsVO.setIndicatorsVOS(indicatorsVOPage.getRecords());
+			beIndicatorsVO.setIndicatorsVOS(indicatorsVOPage);
 		}
-
 		return R.data(beIndicatorsVO);
 	}
 
+	/**
+	 * @return
+	 */
+	@Override
+	public R deptList() {
+		BladeUser user = AuthUtil.getUser();
+		List<Dept> userDeptNode = deptClient.getUserDeptNode(Long.parseLong(user.getDeptId()));
+		return R.data(userDeptNode);
+	}
+
 	private List<ClassifyApiVO> getClassifyList(Long pid) {
 	 return baseMapper.selectAllClassifyList(pid);
 	}