导入增加二级分类

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ContractController.java

@@ -64,7 +64,7 @@ public class ContractController {
     public HttpRespMsg importContract (HttpServletRequest request, MultipartFile file){
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
-        if (user.getCompanyId() == 10) {
+        if (user.getCompanyId() == 10 || user.getCompanyId() == 4215) {
             return contractService.importContractCustom(request,file);
         } else {
             return contractService.importContract(request,file);

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages.properties

@@ -775,6 +775,7 @@ Contract.nameNullError=第{0}行缺少合同名称
 Contract.NoExists=第{0}行合同编号已存在
 Contract.NoRepeat=第{0}行合同编号与第{1}行合同编号重复
 Contract.typeExists=第{0}行合同类型不存在
+Contract.secTypeExists=第{0}行二级分类不存在
 Contract.amountNegative = 合同金额不可为负
 Contract.typeDelError = 该类型尚有合同在使用，无法删除！
 Contract.amountNegativeByCell = 第{0}行合同金额不可为负

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages_en_US.properties

@@ -775,6 +775,7 @@ Contract.nameNullError=The contract name is missing in row {0}
 Contract.NoExists=Contract No. in row {0} already exists
 Contract.NoRepeat=The contract number in line {0} is duplicate with that in line {1}
 Contract.typeExists=The contract type in row {0} does not exist
+Contract.secTypeExists=The secondary type in row {0} does not exist
 Contract.amountNegative = The contract amount cannot be negative
 Contract.typeDelError = This type is still in use and cannot be deleted!
 Contract.amountNegativeByCell = The contract amount in line {0} cannot be negative