1.移转变更不再更新监管码

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -33,6 +33,7 @@ import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
@@ -704,7 +705,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                 }
             }
             // 判断原数据是否存在监管码，存在则用原监管码即可，不存在则生成
-            if ("null".equals(supervisionCode)) {
+            if ("null".equals(supervisionCode) || StringUtils.isEmpty(supervisionCode)) {
                 String supervisor = createSupervisorCode(isNotXiXian, city, county, equipCategory);
                 supervisorCode.append(supervisor);
             } else {