import keyIn

atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateGroupServiceImpl.java

@@ -270,7 +270,8 @@ public class TemplateGroupServiceImpl extends AbstractService {
                             cell.setCellValue(StringUtils.EMPTY);
                             addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList);
                         }
-                        if(!cell.getCellStyle().getLocked() && StringUtils.isNotBlank(POIUtil.getCellFormulaString(cell))) {
+                        if(!cell.getCellStyle().getLocked() && StringUtils.isNotBlank(POIUtil.getCellFormulaString(cell))
+                        && "${KeyIn}".equalsIgnoreCase(POIUtil.getCellFormulaString(cell))) {
                             CellTemplateConfig config = new CellTemplateConfig();
                             config.setId(distributedIdService.nextId());
                             config.setCellTemplateId(cellTemplate.getId());
@@ -356,8 +357,7 @@ public class TemplateGroupServiceImpl extends AbstractService {
                     for(int k = row.getFirstCellNum(); k < row.getLastCellNum(); k++){
                         Cell cell = row.getCell(k);
                         cell.setCellType(CellType.STRING);
-                        if(!cell.getCellStyle().getLocked() && StringUtils.isNotBlank(cell.getStringCellValue())
-                        && cell.getStringCellValue().equalsIgnoreCase("${KeyIn}")){
+                        if(!cell.getCellStyle().getLocked()  && "${KeyIn}".equalsIgnoreCase(cell.getStringCellValue())){
                             cell.setCellValue("");
                         }
                     }
@@ -406,7 +406,8 @@ public class TemplateGroupServiceImpl extends AbstractService {
                             cell.setCellValue(StringUtils.EMPTY);
                             addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList);
                         }
-                        if(!cell.getCellStyle().getLocked() && StringUtils.isNotBlank(POIUtil.getCellFormulaString(cell))) {
+                        if(!cell.getCellStyle().getLocked() && StringUtils.isNotBlank(POIUtil.getCellFormulaString(cell))
+                                && "${KeyIn}".equalsIgnoreCase(POIUtil.getCellFormulaString(cell))) {
                             CellTemplateConfig config = new CellTemplateConfig();
                             config.setId(distributedIdService.nextId());
                             config.setCellTemplateId(cellTemplate.getId());