查询素材分组带上企业微信id

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

@@ -12,7 +12,7 @@ import java.util.List;
 
 public interface MaterialApiService {
 
-    boolean hasCategoryNameExsit(String categoryName, String categoryParentId, String categoryId);
+    boolean hasCategoryNameExsit(String categoryName, String categoryParentId, String categoryId,String wxEnterpriseId);
 
     void insertCategory(MaterialCategoryDTO materialCategoryDTO);
 

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

@@ -20,7 +20,9 @@ public interface TabHaobanMaterialCategoryMapper {
 
     int updateByPrimaryKey(TabHaobanMaterialCategory record);
 
-	TabHaobanMaterialCategory selectByCategoryNameAndParentId(@Param("categoryName")String categoryName, @Param("categoryParentId")String categoryParentId);
+	TabHaobanMaterialCategory selectByCategoryNameAndParentId(@Param("categoryName")String categoryName,
+                                                              @Param("categoryParentId")String categoryParentId,
+                                                              @Param("wxEnterpriseId")String wxEnterpriseId);
 
 	List<TabHaobanMaterialCategory> listCategory(@Param("wxEnterpriseId")String wxEnterpriseId);
 

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

@@ -6,7 +6,7 @@ import com.gic.haoban.manage.api.dto.MaterialCategoryDTO;
 
 public interface MaterialCategoryService {
 
-	MaterialCategoryDTO hasCategoryNameExsit(String categoryName, String categoryParentId);
+	MaterialCategoryDTO hasCategoryNameExsit(String categoryName, String categoryParentId,String wxEnterpriseId);
 
 	void insert(MaterialCategoryDTO materialCategoryDTO);
 

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

@@ -20,8 +20,8 @@ public class MaterialCategoryServiceImpl implements MaterialCategoryService{
 	private TabHaobanMaterialCategoryMapper mapper;
 
 	@Override
-	public MaterialCategoryDTO hasCategoryNameExsit(String categoryName, String categoryParentId) {
-		return 	EntityUtil.changeEntityByJSON(MaterialCategoryDTO.class, mapper.selectByCategoryNameAndParentId(categoryName,categoryParentId));
+	public MaterialCategoryDTO hasCategoryNameExsit(String categoryName, String categoryParentId,String wxEnterpriseId) {
+		return 	EntityUtil.changeEntityByJSON(MaterialCategoryDTO.class, mapper.selectByCategoryNameAndParentId(categoryName,categoryParentId,wxEnterpriseId));
 	}
 
 	@Override

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

@@ -72,8 +72,8 @@ public class MaterialApiServiceImpl implements MaterialApiService {
     private static Logger logger = LoggerFactory.getLogger(MaterialApiServiceImpl.class);
 
     @Override
-    public boolean hasCategoryNameExsit(String categoryName, String categoryParentId, String categoryId) {
-        MaterialCategoryDTO category = materialCategoryService.hasCategoryNameExsit(categoryName, categoryParentId);
+    public boolean hasCategoryNameExsit(String categoryName, String categoryParentId, String categoryId,String wxEnterpriseId) {
+        MaterialCategoryDTO category = materialCategoryService.hasCategoryNameExsit(categoryName, categoryParentId,wxEnterpriseId);
         if (category != null) {
             if (category.getCategoryId().equals(categoryId)) {
                 return false;

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

@@ -123,6 +123,7 @@
     where category_name = #{categoryName,jdbcType=VARCHAR}
     and status_flag = 1
     and category_parent_id = #{categoryParentId}
+    and wx_enterprise_id = #{wxEnterpriseId}
   </select>
   
   <select id="listCategory" resultMap="BaseResultMap" parameterType="java.lang.String" >

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

@@ -47,7 +47,7 @@ public class MaterialController extends WebBaseController {
         if (StringUtils.isAnyBlank(categoryParentId, categoryName)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
-        boolean flag = materialApiService.hasCategoryNameExsit(categoryName, categoryParentId, null);
+        boolean flag = materialApiService.hasCategoryNameExsit(categoryName, categoryParentId, null,wxEnterpriseId);
         if (flag) {
             return resultResponse(HaoBanErrCode.ERR_10015);
         }
@@ -75,7 +75,8 @@ public class MaterialController extends WebBaseController {
     public HaobanResponse categoryEdit(MaterialCategoryDTO materialCategoryDTO) {
         String categoryName = materialCategoryDTO.getCategoryName();
         String categoryId = materialCategoryDTO.getCategoryId();
-        if (StringUtils.isAnyBlank(categoryName, categoryId)) {
+        String wxEnterpriseId = materialCategoryDTO.getWxEnterpriseId();
+        if (StringUtils.isAnyBlank(categoryName, categoryId,wxEnterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
         MaterialCategoryDTO dto = materialApiService.selectMaterialCategoryById(categoryId);
@@ -83,7 +84,7 @@ public class MaterialController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_10016);
         }
         String categoryParentId = dto.getCategoryParentId();
-        boolean flag = materialApiService.hasCategoryNameExsit(categoryName, categoryParentId, materialCategoryDTO.getCategoryId());
+        boolean flag = materialApiService.hasCategoryNameExsit(categoryName, categoryParentId, materialCategoryDTO.getCategoryId(),wxEnterpriseId);
         if (flag) {
             return resultResponse(HaoBanErrCode.ERR_10015);
         }