|
@@ -24,7 +24,6 @@ import com.diagbot.entity.QuestionInfo;
|
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
|
import com.diagbot.enums.ModuleInfoTypeEnum;
|
|
|
import com.diagbot.enums.QuestionTypeEnum;
|
|
|
-import com.diagbot.enums.TagTypeEnum;
|
|
|
import com.diagbot.service.impl.ModuleInfoServiceImpl;
|
|
|
import com.diagbot.util.BeanUtil;
|
|
|
import com.diagbot.util.DateUtil;
|
|
@@ -588,10 +587,10 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
|
|
|
.in("id", moduleIds))
|
|
|
.stream().map(row -> row.getName()).collect(Collectors.toList());
|
|
|
for (String mouduleName: moduleNames) {
|
|
|
- errMsg.append("该标签已关联").append("【" + mouduleName + "】").append("<br/>");
|
|
|
+ errMsg.append("请先删除关联模板:").append("【" + mouduleName + "】").append("<br/>");
|
|
|
}
|
|
|
}
|
|
|
- StringBuffer titalMsg = new StringBuffer();
|
|
|
+ /*StringBuffer titalMsg = new StringBuffer();
|
|
|
StringBuffer questionMsg = new StringBuffer();
|
|
|
List<QuestionInfo> info = questionFacade.getParentQuestion(getQuestiongAndModuleRelationsVO.getQuestionId());
|
|
|
for (QuestionInfo bean : info) {
|
|
@@ -603,9 +602,9 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
|
|
|
questionMsg.append("【"+bean.getTagName()+"】");
|
|
|
}
|
|
|
}
|
|
|
- titalMsg.append("该标签已关联父级:").append(questionMsg).append("<br/>").append(errMsg);
|
|
|
+ titalMsg.append("该标签已关联父级:").append(questionMsg).append("<br/>").append(errMsg);*/
|
|
|
GetQuestiongAndModuleRelationsDTO getQuestiongAndModuleRelationsDTO = new GetQuestiongAndModuleRelationsDTO();
|
|
|
- getQuestiongAndModuleRelationsDTO.setRelationInfos(titalMsg.append("是否删除?"));
|
|
|
+ getQuestiongAndModuleRelationsDTO.setRelationInfos(errMsg);
|
|
|
return getQuestiongAndModuleRelationsDTO;
|
|
|
}
|
|
|
|