Merge branch 'contract/sato/1.0.600_59888' into 'contract/sato/1.0.600'

#59888 typoによるcategory_idが保存できない問題の修正とジャンル別に分ける処理をcategoryId基準で分けるように変更

See merge request !325

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ContentDao.java

@@ -220,7 +220,7 @@ public class ContentDao extends AbstractDao {
 		}
 
 		// ABookCheck用
-		column = cursor.getColumnIndex("categeory_id");
+		column = cursor.getColumnIndex("category_id");
 		if (column != -1) {
 			dto.categoryId = cursor.getInt(column);
 		}

ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/CategoryContentDto.java

@@ -3,6 +3,8 @@ package jp.agentec.abook.abv.bl.dto;
 import java.util.List;
 
 public class CategoryContentDto {
+
+    public int categoryId;
     public String categoryName;
     public List<ContentDto> contentDtoArray;
 }

ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java

@@ -1323,7 +1323,7 @@ public class OperationLogic extends AbstractLogic {
         CategoryContentDto categoryContentDto = new CategoryContentDto();
 
         for (ContentDto contentDto : contentDtoList) {
-            if (contentDto.categoryNames.equals(categoryContentDto.categoryName)) {
+            if (contentDto.categoryId == categoryContentDto.categoryId) {
                     saveContentDtoArray.add(contentDto);
             } else {
                 if (saveContentDtoArray.size() != 0) {
@@ -1332,6 +1332,7 @@ public class OperationLogic extends AbstractLogic {
                 }
                 categoryContentDto = new CategoryContentDto();
                 saveContentDtoArray = new ArrayList<ContentDto>();
+                categoryContentDto.categoryId = contentDto.categoryId;
                 categoryContentDto.categoryName = contentDto.categoryNames;
                 saveContentDtoArray.add(contentDto);
             }