优化许可信息数据集成企业接口

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/PrivilegeCompanyUpdateAddListener.java

@@ -131,11 +131,21 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
                 accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
             } else if(tzBaseEnterprisePrivilegeInfo == null){
                 //企业表没有，平台表有
+                if(!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())){
+                    companyModel.setCompanyType(companyPrivilegeModel.getCompanyType()+","+companyModel.getCompanyType());
+                }else {
+                    companyModel.setCompanyType(companyPrivilegeModel.getCompanyType());
+                }
                 tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
                 Privilege.companyClient.update(companyModel, companyPrivilegeModel.getSequenceNbr());
                 accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
             } else if(companyPrivilegeModel == null){
                 //平台表没有，企业表有
+                if(!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(tzBaseEnterpriseInfo.getUnitType())){
+                    tzBaseEnterpriseInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType()+","+tzBaseEnterpriseInfo.getUnitType());
+                }else {
+                    tzBaseEnterpriseInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType());
+                }
                 Privilege.companyClient.create(companyModel);
                 tzBaseEnterpriseInfoService.update(tzBaseEnterpriseInfo,updateWrapper);
                 accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
@@ -143,10 +153,28 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
             else {
                 //当企业表、平台表 中有时
                 if (tzBaseEnterprisePrivilegeInfo.getRecDate().compareTo(object.getDate("issue_date")) < 1) {
+                    if(!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(tzBaseEnterpriseInfo.getUnitType())){
+                        tzBaseEnterpriseInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType()+","+tzBaseEnterpriseInfo.getUnitType());
+                    }else {
+                        tzBaseEnterpriseInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType());
+                    }
+                    if(!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())){
+                        companyModel.setCompanyType(companyPrivilegeModel.getCompanyType()+","+companyModel.getCompanyType());
+                    }else {
+                        companyModel.setCompanyType(companyPrivilegeModel.getCompanyType());
+                    }
                     tzBaseEnterpriseInfoService.update(tzBaseEnterpriseInfo,updateWrapper);
                     Privilege.companyClient.update(companyModel, companyPrivilegeModel.getSequenceNbr());
                     accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
                 } else {
+                    if(!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(tzBaseEnterpriseInfo.getUnitType())){
+                        tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType()+","+tzBaseEnterpriseInfo.getUnitType());
+                        tzBaseEnterpriseInfoService.update(tzBaseEnterprisePrivilegeInfo,updateWrapper);
+                    }
+                    if(!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())){
+                        companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType()+","+companyModel.getCompanyType());
+                        Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
+                    }
                     System.out.println("该数据不是最新的数据 不用更新");
                     accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
                 }