test

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -384,15 +384,15 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         BaseAgency baseAgency = this.baseAgencyService.getById(pmDemand.getAgencyId());
         List<SysDictData> dictData = dictTypeService.selectDictDataByType(Constants.SYS_COMPANY_NATURE);
         for (SysDictData data : dictData) {
-            if (data.getDictValue().equals(baseAgency.getCompanyType())) {
-                baseAgency.setCompanyTypeName(data.getDictLabel());
+            if (data.getDictValue().equals(baseAgency.getCompanyNature())) {
+                baseAgency.setCompanyNatureName(data.getDictLabel());
                 break;
             }
         }
         List<SysDictData> dictDataT = dictTypeService.selectDictDataByType(Constants.SYS_PROJECT_TYPE);
         for (SysDictData data : dictDataT) {
-            if (data.getDictValue().equals(baseAgency.getCompanyNature())) {
-                baseAgency.setCompanyNatureName(data.getDictLabel());
+            if (data.getDictValue().equals(baseAgency.getCompanyType() + "")) {
+                baseAgency.setCompanyTypeName(data.getDictLabel());
                 break;
             }
         }