合并分支 'dev_third_stage' 到 'master'

Dev third stage

查看合并请求 laws-nio/laws-weilai!78

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java

@@ -594,4 +594,13 @@ public class SysCategoryController {
 		return Result.OK(sysCategoryService.getSysCategoryTree(flag));
 	}
 
+	/**
+	 * 只查询评估方式的树形数据字典
+	 * @return
+	 */
+	@GetMapping("/getEvaluationMethodTree")
+	public Result getevaluationMethodTree() {
+		String flag = "evaluation_method";
+		return Result.OK(sysCategoryService.getSysCategoryTree(flag));
+	}
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java

@@ -273,6 +273,8 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 			String dictId = "";
 			if("deliverable_template".equals(flag)){
 				dictId = sysCategoryMapper.getDictId("deliverable_template");
+			}else if("evaluation_method".equals(flag)){
+				dictId = sysCategoryMapper.getDictId("evaluation_method");
 			}else{
 				dictId = sysCategoryMapper.getFieldInfo("technology_territory");
 			}