修改删除目录关联的数据项问题bug

src/main/java/com/keymobile/indicators/api/hytobacco/IndCatalogCtrl.java

@@ -41,8 +41,9 @@ public class IndCatalogCtrl {
 	
 	@ApiOperation(value = "获取基础指标目录", notes = "获取基础指标目录")
 	@PostMapping(value = "/getBaseIndCatalog")
-	public List<IndCatalog> getBaseIndCatalog(@RequestParam String parentId,@RequestParam String type){
-		return indCatalogService.getCatalog(parentId, type);
+	public List<IndCatalog> getBaseIndCatalog(@RequestParam(required=false) String parentId,
+			@RequestParam List<String> codes){
+		return indCatalogService.getCatalog(parentId, codes);
 	}
 	
 	//考核指标目录
@@ -61,7 +62,8 @@ public class IndCatalogCtrl {
 	
 	@ApiOperation(value = "获取考核指标目录", notes = "获取考核指标目录")
 	@PostMapping(value = "/getDriveIndCatalog")
-	public List<DriveIndCatalog> getDriveIndCatalog(@RequestParam String parentId,@RequestParam String type){
-		return driveIndCatalogService.getCatalog(parentId, type);
+	public List<DriveIndCatalog> getDriveIndCatalog(@RequestParam(required=false) String parentId,
+			@RequestParam List<String> codes){
+		return driveIndCatalogService.getCatalog(parentId, codes);
 	}
 }

src/main/java/com/keymobile/indicators/model/entity/indicators/DriveIndCatalog.java

@@ -24,8 +24,8 @@ public class DriveIndCatalog implements Serializable{
 	@Id
     private String id;
 	private String catalogName;
-	private String type;
-	private String catalogType;//分为数据项级别和数据项类别    0:数据项级别    1：数据项类别
+	//private String type;
+	private String catalogType;//分为数据项级别和数据项类别    0:数据项级别    1：数据项类别  2:普通目录
 	private String parentId;//顶层节点parentId为0
 	private String idPath;
 	private String code;//目录编码

src/main/java/com/keymobile/indicators/model/entity/indicators/IndCatalog.java

@@ -25,8 +25,8 @@ public class IndCatalog implements Serializable{
 	@Id
     private String id;
 	private String catalogName;
-	private String type;
-	private String catalogType;//分为数据项级别和数据项类别    0:数据项级别    1：数据项类别
+	//private String type;
+	private String catalogType;//分为数据项级别和数据项类别    0:数据项级别    1：数据项类别    2：普通目录
 	private String parentId;//顶层节点parentId为0
 	private String idPath;
 	private String code;//目录编码

src/main/java/com/keymobile/indicators/persistence/hyindicators/DriveIndCatalogRepository.java

@@ -9,7 +9,7 @@ import com.keymobile.indicators.model.entity.indicators.DriveIndCatalog;
 public interface DriveIndCatalogRepository extends MongoRepository<DriveIndCatalog,String>{
 	public void deleteByIdIn(List<String> ids);
 	
-	public List<DriveIndCatalog> findByParentIdAndTypeOrderByLastUpdateTimeDesc(String pid,String type);
+	public List<DriveIndCatalog> findByParentIdAndCodeInOrderByLastUpdateTimeDesc(String pid,List<String> codes);
 	
 	public List<DriveIndCatalog> findByParentId(String pid);
 }

src/main/java/com/keymobile/indicators/persistence/hyindicators/IndCatalogRepository.java

@@ -10,7 +10,7 @@ public interface IndCatalogRepository extends MongoRepository<IndCatalog,String>
 
 	public void deleteByIdIn(List<String> ids);
 	
-	public List<IndCatalog> findByParentIdAndTypeOrderByLastUpdateTimeDesc(String pid,String type);
+	public List<IndCatalog> findByParentIdAndCodeInOrderByLastUpdateTimeDesc(String pid,List<String> codes);
 	
 	public List<IndCatalog> findByParentId(String pid);
 }

src/main/java/com/keymobile/indicators/service/hytobacco/DriveIndCatalogService.java

@@ -75,10 +75,10 @@ public class DriveIndCatalogService {
 	}
 	
 	//获取目录树
-	public List<DriveIndCatalog> getCatalog(String parentId,String type){
+	public List<DriveIndCatalog> getCatalog(String parentId,List<String> codes){
 		if(StringUtils.isBlank(parentId) || "0".equals(parentId)) {
-			return driveIndCatalogRepo.findByParentIdAndTypeOrderByLastUpdateTimeDesc("0", type);
+			return driveIndCatalogRepo.findByParentIdAndCodeInOrderByLastUpdateTimeDesc("0", codes);
 		}
-		return driveIndCatalogRepo.findByParentIdAndTypeOrderByLastUpdateTimeDesc(parentId, type);
+		return driveIndCatalogRepo.findByParentIdAndCodeInOrderByLastUpdateTimeDesc(parentId, codes);
 	}
 }

src/main/java/com/keymobile/indicators/service/hytobacco/IndCatalogService.java

@@ -74,10 +74,10 @@ public class IndCatalogService {
 	}
 	
 	//获取目录树
-	public List<IndCatalog> getCatalog(String parentId,String type){
+	public List<IndCatalog> getCatalog(String parentId,List<String> codes){
 		if(StringUtils.isBlank(parentId) || "0".equals(parentId)) {
-			return indCatalogRepo.findByParentIdAndTypeOrderByLastUpdateTimeDesc("0", type);
+			return indCatalogRepo.findByParentIdAndCodeInOrderByLastUpdateTimeDesc("0", codes);
 		}
-		return indCatalogRepo.findByParentIdAndTypeOrderByLastUpdateTimeDesc(parentId, type);
+		return indCatalogRepo.findByParentIdAndCodeInOrderByLastUpdateTimeDesc(parentId, codes);
 	}
 }

src/main/resources/mybatis/mapping/BaseIndDefMapper.xml

@@ -28,8 +28,8 @@
     
     <delete id="deleteByCatalogIdIn" parameterType="java.util.List">
     	delete 
-    	from base_ind_def t 
-    	where t.catalog_id in
+    	from base_ind_def 
+    	where catalog_id in
         <foreach item="id" collection="list" open="(" close=")" separator=",">
             #{id}
         </foreach>

src/main/resources/mybatis/mapping/DriveIndDefMapper.xml

@@ -28,8 +28,8 @@
     
     <delete id="deleteByCatalogIdIn" parameterType="java.util.List">
     	delete 
-    	from drive_ind_def t 
-    	where t.catalog_id in
+    	from drive_ind_def 
+    	where catalog_id in
         <foreach item="id" collection="list" open="(" close=")" separator=",">
             #{id}
         </foreach>