fix

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MaterialApiService.java

@@ -31,4 +31,6 @@ public interface MaterialApiService {
 
 	String reUpdalodMetail(String materialId);
 
+	List<MaterialCategoryDTO> listByParentCategory(String categoryId);
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanMaterialCategoryMapper.java

@@ -23,4 +23,6 @@ public interface TabHaobanMaterialCategoryMapper {
 	TabHaobanMaterialCategory selectByCategoryNameAndParentId(@Param("categoryName")String categoryName, @Param("categoryParentId")String categoryParentId);
 
 	List<TabHaobanMaterialCategory> listCategory(@Param("wxEnterpriseId")String wxEnterpriseId);
+
+	List<TabHaobanMaterialCategory> listByParentCategory(@Param("categoryId")String categoryId);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/MaterialCategoryService.java

@@ -16,4 +16,6 @@ public interface MaterialCategoryService {
 
 	void editCategory(MaterialCategoryDTO materialCategoryDTO);
 
+	List<MaterialCategoryDTO> listByParentCategory(String categoryId);
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialCategoryServiceImpl.java

@@ -49,4 +49,9 @@ public class MaterialCategoryServiceImpl implements MaterialCategoryService{
 		mapper.updateByPrimaryKeySelective(EntityUtil.changeEntityByJSON(TabHaobanMaterialCategory.class, materialCategoryDTO));
 	}
 
+	@Override
+	public List<MaterialCategoryDTO> listByParentCategory(String categoryId) {
+		return EntityUtil.changeEntityListByJSON(MaterialCategoryDTO.class, mapper.listByParentCategory(categoryId));
+	}
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MaterialApiServiceImpl.java

@@ -243,4 +243,9 @@ public class MaterialApiServiceImpl implements MaterialApiService {
 		return null;
 	}
 
+	@Override
+	public List<MaterialCategoryDTO> listByParentCategory(String categoryId) {
+		return materialCategoryService.listByParentCategory(categoryId);
+	}
+
 }

haoban-manage3-service/src/main/resources/mapper/TabHaobanMaterialCategoryMapper.xml

@@ -132,4 +132,12 @@
     where status_flag = 1
     and wx_enterprise_id = #{wxEnterpriseId}
   </select>
+  
+  <select id="listByParentCategory" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_material_category
+    where status_flag = 1
+    and category_parent_id = #{categoryId}
+  </select>
 </mapper>
\ No newline at end of file

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/MaterialController.java

@@ -93,6 +93,11 @@ public class MaterialController extends WebBaseController{
 		if(dto == null){
 			return resultResponse(HaoBanErrCode.ERR_10016);
 		}
+		List<MaterialCategoryDTO> categoryList = materialApiService.listByParentCategory(categoryId);
+		if(categoryList != null && !categoryList.isEmpty()){
+			return resultResponse(HaoBanErrCode.ERR_10017);
+		}
+		
 		List<MaterialDTO> list = materialApiService.listMaterialByCategoryId(categoryId);
 		if(list!= null && !list.isEmpty()){
 			return resultResponse(HaoBanErrCode.ERR_10017);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -95,6 +95,8 @@ public enum HaoBanErrCode {
     
     ERR_10018(10018,"素材不存在"),
     
+    ERR_10019(10019,"存在子分组不能删除"),
+    
     ERR_100015(100015,"暂存部门不能删除"),