Parcourir la source

Merge remote-tracking branch 'origin/test'

limin il y a 7 ans
Parent
commit
b1675b9e39

+ 1 - 1
src/main/java/com/goafanti/app/controller/OpenAppHomeController.java

@@ -207,7 +207,7 @@ public class OpenAppHomeController extends BaseApiController{
 	public Result getApplicationData(String apiUrl,Integer pageNo,Integer pageSize,HttpServletRequest request) {
 		Result result=new Result();
 		Map<String, Object> map=jtTagService.getApplicationData(3,1,3,3,3,1,2);
-		map.put("technologyProject", jtBusinessService.getCategoryByModule(5,2));
+		map.put("technologyProject", jtBusinessService.getCategoryByModule(5,2,6));
 		result.setData(map);
 		return result;
 	}

+ 1 - 1
src/main/java/com/goafanti/business/service/JtBusinessService.java

@@ -39,7 +39,7 @@ public interface JtBusinessService {
 	 * @param module
 	 * @return
 	 */
-	List<JtBusinessCategory> getCategoryByModule(Integer module,Integer layer);
+	List<JtBusinessCategory> getCategoryByModule(Integer module,Integer layer,Integer size);
 	
 	/**
 	 * 查看模块项目

+ 2 - 2
src/main/java/com/goafanti/business/service/impl/JtBusinessServiceImpl.java

@@ -450,8 +450,8 @@ public class JtBusinessServiceImpl  extends BaseMybatisDao<JtBusinessProjectMapp
 	}
 
 	@Override
-	public List<JtBusinessCategory> getCategoryByModule(Integer module,Integer layer) {
-		return jtBusinessCategoryMapper.getCategoryByModule(module, layer);
+	public List<JtBusinessCategory> getCategoryByModule(Integer module,Integer layer,Integer size) {
+		return jtBusinessCategoryMapper.getCategoryByModule(module, layer, size);
 	}
 	
 	@Override

+ 1 - 1
src/main/java/com/goafanti/common/dao/JtBusinessCategoryMapper.java

@@ -95,7 +95,7 @@ public interface JtBusinessCategoryMapper {
     
     Integer updateNumberPrefix(JtBusinessCategory jtBusinessCategory);
     
-    List<JtBusinessCategory> getCategoryByModule(@Param("module")Integer module,@Param("layer")Integer layer);
+    List<JtBusinessCategory> getCategoryByModule(@Param("module")Integer module,@Param("layer")Integer layer,@Param("size")Integer size);
 
 	JtBusinessCategory selectFirstLevel(String id, Integer module, String superId,@Param("type")Integer type);
 	

+ 1 - 0
src/main/java/com/goafanti/common/mapper/JtBusinessCategoryMapper.xml

@@ -562,6 +562,7 @@ and layer=#{0}
     and layer=#{layer,jdbcType=INTEGER}
     </if> 
     order by layer,sort
+     limit #{size}
     </select>
     
     <select id="selectFirstLevel" resultMap="BaseResultMap">

+ 1 - 1
src/main/java/com/goafanti/common/mapper/JtBusinessProjectMapper.xml

@@ -907,7 +907,7 @@
   </select>
   
   <!-- 根据项目标签名称查出拥有该标签的项目  -->
-  <select id="getProjectByTag" resultType="com.goafanti.common.model.JtBusinessProject">
+  <select id="getProjectByTag" resultMap="BaseResultMap">
   select p.* from jt_tag t 
   inner join jt_business_project_tag pt on t.id = pt.tag_id
   inner join jt_business_project p on pt.project_id = p.id