Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-08-22 0aa2dd71fa4b989838f89aff2cac82950a70097f

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java

@@ -120,11 +120,17 @@
                if(model !=null){
                    //如果已存在，则更新数据
                    model =  initDataByHkData(model,device,date);
                    if(allHkList.size()==1){
                        model.setIsDefault(Constants.ZERO);
                    }
                    editList.add(model);
                }else{
                    //如果不存在，则新增数据
                    model = new DeviceRole();
                    model =  initDataByHkData(model,device,date);
                    if(allHkList.size()==1){
                        model.setIsDefault(Constants.ZERO);
                    }
                    addList.add(model);
                }
            }