Browse Source

bug解决

wangyu 6 years atrás
parent
commit
3078771c11

+ 3 - 1
icssman-service/src/main/java/com/diagbot/facade/ModuleDetailFacade.java

@@ -108,6 +108,7 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
         }
         QuestionInfo addquestionInfo = null;
         List<QuestionInfo> addQuestionInfoList = new ArrayList<>();
+        List<String> textExistList = new ArrayList<>();
         //循环给questionId赋值,如果遇到赋值失败的则是没有questionID,执行添加
         for (AddModuleDetailVO addModuleDetailVO:addModuleInfoVO.getModelDetils()) {
             if (StringUtil.isNotEmpty(addModuleDetailVO.getText())){
@@ -124,7 +125,8 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
                     addquestionInfo.setType(addModuleInfoVO.getTextType());
                     addquestionInfo.setSubType(1);
                     addquestionInfo.setName(addModuleDetailVO.getText());
-                    if(!addQuestionInfoList.contains(addquestionInfo)){
+                    if(!textExistList.contains(addModuleDetailVO.getText())){
+                        textExistList.add(addModuleDetailVO.getText());
                         addQuestionInfoList.add(addquestionInfo);
                     }
                 }

+ 0 - 9
icssman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -103,15 +103,6 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
     public Boolean saveModuleInfo(AddModuleInfoVO addModulInfoVO) {
         String userId = UserUtils.getCurrentPrincipleID();
         Date now = DateUtil.now();
-        //查询该模板是否添加过
-        QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
-        moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("name", addModulInfoVO.getName());
-        ModuleInfo moduleInfos = this.getOne(moduleInfoQueryWrapper);
-        if (null != moduleInfos) {
-            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED,
-                    "模板名重复,请勿重复添加");
-        }
         ModuleInfo moduleInfo = new ModuleInfo();
         BeanUtil.copyProperties(addModulInfoVO, moduleInfo);
         moduleInfo.setCreator(userId);

+ 1 - 1
icssman-service/src/main/resources/mapper/ModuleInfoMapper.xml

@@ -33,7 +33,7 @@
         <if test="type != null and type != ''">
             and type = #{type}
         </if>
-        <if test="moduleType != null and moduleType != ''">
+        <if test="moduleType != null">
             and  module_type = #{moduleType}
         </if>
         <if test="relationId != null and relationId != ''">